Merge branch 'master' of github.com:samuelchen/optenum

samuelchen · Jun 4, 2019 · afe3d12 · afe3d12
2 parents 3922d9e + 0dfeeb1
commit afe3d12
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/RELEASENOTE.md b/RELEASENOTE.md
@@ -1,7 +1,11 @@
 
 # v1.1.6
 
+<<<<<<< HEAD
 * Group supports +(plus) operator
+=======
+* Group supports + operator
+>>>>>>> 0dfeeb19331c42364e451cbd877ac8394f8e3a12
 
 # v1.1.5