From ef0b0be4f2c894f02e38b6e6da2a53dec4426ffe Mon Sep 17 00:00:00 2001
From: Jonathan Bernard <jonathan_bernard@quantumdigital.com>
Date: Fri, 27 May 2011 12:48:32 -0500
Subject: [PATCH] Fixed merge problems.

---
 libpit/project.properties  | 10 ----------
 pit-cli/project.properties |  9 ---------
 2 files changed, 19 deletions(-)

diff --git a/libpit/project.properties b/libpit/project.properties
index 616718f..4db4631 100755
--- a/libpit/project.properties
+++ b/libpit/project.properties
@@ -1,20 +1,10 @@
-<<<<<<< HEAD
-#Wed, 19 May 2010 08:06:01 -0500
-=======
-#Fri, 27 May 2011 12:38:44 -0500
->>>>>>> 3278213... Fixed bug, pit-cli now trims input directory.
 #Sat Apr 24 17:08:00 CDT 2010
 build.dir=build
 src.dir=src
 lib.shared.dir=../shared-libs
 test.dir=test
-<<<<<<< HEAD
-build.number=1
-expected.application.version=2.3.1
-=======
 build.number=4
 expected.application.version=2.5.1
->>>>>>> 3278213... Fixed bug, pit-cli now trims input directory.
 lib.dir=lib
 release.dir=release
 release.jar=pit-${application.version}.jar
diff --git a/pit-cli/project.properties b/pit-cli/project.properties
index c7564bf..80a3582 100755
--- a/pit-cli/project.properties
+++ b/pit-cli/project.properties
@@ -1,18 +1,9 @@
-<<<<<<< HEAD
-=======
-#Fri, 27 May 2011 12:38:58 -0500
->>>>>>> 3278213... Fixed bug, pit-cli now trims input directory.
 #Sat Feb 27 03:01:15 CST 2010
 build.dir=build
 src.dir=src
 build.jar=pit-cli-${application.version}.${build.number}.jar
-<<<<<<< HEAD
-build.number=1
-expected.application.version=2.1.0
-=======
 build.number=5
 expected.application.version=2.5.1
->>>>>>> 3278213... Fixed bug, pit-cli now trims input directory.
 lib.dir=lib
 release.dir=release
 release.jar=pit-cli-${application.version}.jar