From a0b2feb8729b85861cb8f865f012b4df0766fb3c Mon Sep 17 00:00:00 2001
From: Vishwas Babu A J <vishwas@confluxtechnologies.com>
Date: Mon, 12 Aug 2013 22:42:32 +0530
Subject: [PATCH] dev branch prepped for 1.8.0 release

---
 mifosng-provider/gradle.properties | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/mifosng-provider/gradle.properties b/mifosng-provider/gradle.properties
index 39e7b9f7f..9b500178d 100644
--- a/mifosng-provider/gradle.properties
+++ b/mifosng-provider/gradle.properties
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
 releaseVersion=1.8.0.DEVELOP
-=======
-releaseVersion=1.7.1.RELEASE
->>>>>>> master
+