From 7b0f3f6e3c225bded6045aa511fbcdc8397d0d94 Mon Sep 17 00:00:00 2001
From: WayofTime <wtime@live.ca>
Date: Fri, 19 Jun 2015 07:05:51 -0400
Subject: [PATCH] Fixed the build properties.

---
 build.properties | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/build.properties b/build.properties
index 43181560..9949555a 100644
--- a/build.properties
+++ b/build.properties
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
 #
 #Thu Jun 04 17:28:17 EDT 2015
-=======
->>>>>>> ff8cf59bb8a81f12bb160df827bf73439e7855c2
 mod_name=BloodMagic
 forge_version=10.13.4.1448-1.7.10
 ccc_version=1.0.4.29
@@ -14,7 +11,5 @@ mod_version=1.3.3
 minetweaker_version=Dev-1.7.10-3.0.9B
 build_number=5
 mc_version=1.7.10
-<<<<<<< HEAD
 build_number=5
-=======
->>>>>>> ff8cf59bb8a81f12bb160df827bf73439e7855c2
+