Update NEWS.md

[ci skip]
stan-dev · Feb 1, 2017 · e30c816 · e30c816
1 parent 504e989
commit e30c816
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -10,8 +10,7 @@ relevant for models _not_ fit using Stan.
 * Add NUTS energy diagnostic plots to Diagnose page
 * Allowing passing `sampler_params` to `as.shinystan`. This makes it possible to
 display sampler diagnositcs for HMC/NUTS even if not using Stan's implementation
-of those algorithms (thanks to Cole Monnahan)
->>>>>>> develop
+of those algorithms (thanks to Cole Monnahan).
 
 ### Version 2.2.1