Changeset 6157 for branches/OKBJavaConnector/AuthenticationService/nbproject/genfiles.properties

Timestamp:

05/07/11 14:24:19 (14 years ago)

Author:

bfarka

Message:

added ecj and custom statistics to communicate with the okb services #1441

File:

• branches/OKBJavaConnector/AuthenticationService/nbproject/genfiles.properties (modified) (1 diff)

branches/OKBJavaConnector/AuthenticationService/nbproject/genfiles.properties

@@ -5 +5 @@
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=91684422
+<<<<<<< .mine
+nbproject/build-impl.xml.script.CRC32=6a8308f2
+nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45
+=======
 nbproject/build-impl.xml.script.CRC32=71faff76
 nbproject/build-impl.xml.stylesheet.CRC32=f33e10ff@1.38.2.45
+>>>>>>> .r6152