jvanzyl 01/07/09 19:05:17
Modified: build build.properties
Log:
- fixing conflict
Revision Changes Path
1.9 +0 -1 jakarta-turbine/build/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine/build/build.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.properties 2001/07/10 01:43:33 1.8
+++ build.properties 2001/07/10 02:05:15 1.9
@@ -51,4 +51,3 @@
DataDumpControlTemplate = data/dump/Control.vm
DataSQLControlTemplate = sql/load/Control.vm
securityControlTemplate = sql/security/Control.vm
->>>>>>> 1.5
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
