NEWS update -fix conflict-

SantanderMetGroup · Aug 16, 2018 · 53ed779 · 53ed779
1 parent da6ffef
commit 53ed779
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/NEWS b/NEWS
@@ -12,11 +12,7 @@
 * Update climagram vignette
 * Other minor changes and documentation updates
 
-<<<<<<< HEAD
 ## v1.2.2 (16 Aug 2018)
-* Minor doc update
+* Allow for spatial subsetting in temporalPlot (new args lonLim and latLim)
+* Minor doc updates
 * Release for the climate4R paper submitted to EMS
-=======
-## v1.2.2 (15 Aug 2018)
-* allow for spatial subsetting in temporalPlot (new args lonLim and latLim)
->>>>>>> 51a8d7aa0d78acd34699172fdd47c62fdd158963