jdb/pit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed merge problems.

Browse Source
This commit is contained in:
Jonathan Bernard 2011-05-27 12:48:32 -05:00
parent b3c223f0b8
commit ef0b0be4f2
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libpit/project.properties
View File

@ -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 #Sat Apr 24 17:08:00 CDT 2010
build.dir=build build.dir=build
src.dir=src src.dir=src
lib.shared.dir=../shared-libs lib.shared.dir=../shared-libs
test.dir=test test.dir=test
<<<<<<< HEAD
build.number=1
expected.application.version=2.3.1
=======
build.number=4 build.number=4
expected.application.version=2.5.1 expected.application.version=2.5.1
>>>>>>> 3278213... Fixed bug, pit-cli now trims input directory.
lib.dir=lib lib.dir=lib
release.dir=release release.dir=release
release.jar=pit-${application.version}.jar release.jar=pit-${application.version}.jar

9
pit-cli/project.properties
View File

@ -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 #Sat Feb 27 03:01:15 CST 2010
build.dir=build build.dir=build
src.dir=src src.dir=src
build.jar=pit-cli-${application.version}.${build.number}.jar build.jar=pit-cli-${application.version}.${build.number}.jar
<<<<<<< HEAD
build.number=1
expected.application.version=2.1.0
=======
build.number=5 build.number=5
expected.application.version=2.5.1 expected.application.version=2.5.1
>>>>>>> 3278213... Fixed bug, pit-cli now trims input directory.
lib.dir=lib lib.dir=lib
release.dir=release release.dir=release
release.jar=pit-cli-${application.version}.jar release.jar=pit-cli-${application.version}.jar