Merge branch 'master' into splotch

* master:
  Fix bug in NAMESPACE

DESCRIPTION

 Package: splatter
 Type: Package
 Title: Simple Simulation of Single-cell RNA Sequencing Data
-Version: 1.9.4.9011
-Date: 2019-08-29
+Version: 1.9.5.9012
+Date: 2019-09-09
 Author: Luke Zappia
 Authors@R:
     c(person("Luke", "Zappia", role = c("aut", "cre"),

NAMESPACE

@@ -66,8 +66,11 @@ export(splatSimulate)
 export(splatSimulateGroups)
 export(splatSimulatePaths)
 export(splatSimulateSingle)
+<<<<<<< HEAD
 export(splotchEstimate)
 export(splotchSimulate)
+=======
+>>>>>>> master
 export(summariseDiff)
 export(zinbEstimate)
 export(zinbSimulate)
@@ -139,8 +142,11 @@ importFrom(methods,validObject)
 importFrom(stats,aggregate)
 importFrom(stats,approxfun)
 importFrom(stats,cor)
+<<<<<<< HEAD
 importFrom(stats,dbeta)
 importFrom(stats,density)
+=======
+>>>>>>> master
 importFrom(stats,dnbinom)
 importFrom(stats,ks.test)
 importFrom(stats,median)

NEWS.md

+### Version 1.9.5.9012 (2019-09-09)
+
+* Merge master into splotch branch
+
+## Version 1.9.5 (2019-09-09)
+
+* Fix bug in NAMESPACE
+
 ### Version 1.9.4.9011 (2019-08-29)
 
 * Add BCV adjustment to Splotch simualation