dev branch prepped for 1.8.0 release

This commit is contained in:
Vishwas Babu A J
2013-08-12 22:42:32 +05:30
parent a2764237a2
commit a0b2feb872
+1 -4
View File
@@ -1,5 +1,2 @@
<<<<<<< HEAD
releaseVersion=1.8.0.DEVELOP
=======
releaseVersion=1.7.1.RELEASE
>>>>>>> master