Merge remote-tracking branch 'origin/master'

Raphael Sonabend · Raphael Sonabend · commit b8dc0eb6207d · 2020-11-01T21:19:12.000Z
Branch: master
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,10 @@
 Package: distr6
 Title: The Complete R6 Probability Distributions Interface
+<<<<<<< HEAD
 Version: 1.4.6
+=======
+Version: 1.4.5.9000
+>>>>>>> master
 Authors@R: 
       c(person(given = "Raphael",
              family = "Sonabend",
diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,10 @@
+<<<<<<< HEAD
 # distr6 1.4.6
 
 * Patch for solaris
+=======
+# distr6 1.4.5.9000
+>>>>>>> master
 
 # distr6 1.4.5
 
