Update info.xml

CiviCooP · Oct 24, 2016 · bcfa865 · bcfa865
1 parent 316b7c4
commit bcfa865
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/info.xml b/info.xml
@@ -14,13 +14,8 @@
     <url desc="Support">http://www.civicoop.org</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-<<<<<<< HEAD
-  <releaseDate>2016-01-12</releaseDate>
+  <releaseDate>2016-10-24</releaseDate>
   <version>2.0</version>
-=======
-  <releaseDate>2016-10-19</releaseDate>
-  <version>1.2</version>
->>>>>>> c02caaaa8511581cf03c63e5dd25035805d62cb8
   <develStage>beta</develStage>
   <compatibility>
     <ver>4.6</ver>