Fixed conflict in ChangeLog

dcdillon · dcdillon · commit a9d6e929f5a8 · 2016-11-13T08:00:00.000-06:00
diff --git a/ChangeLog b/ChangeLog
@@ -6,6 +6,7 @@
         of RNGScope
         * inst/include/Rcpp/vector/Matrix.h: Protected Matrix op Scalar
         definitions with #ifndef RCPP_NO_SUGAR
+
 2016-11-10  Dirk Eddelbuettel  <edd@debian.org>
 
         * inst/include/Rcpp/date_datetime/newDateVector.h: Added constructor
