Fixed merge problems.

2011-05-27 12:48:32 -05:00
parent b3c223f0b8
commit ef0b0be4f2
2 changed files with 0 additions and 19 deletions
--- 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