2014-08-30 12:08:35 +02:00
|
|
|
<<<<<<< HEAD
|
2014-06-11 22:19:35 +02:00
|
|
|
build.xml.data.CRC32=971927a9
|
2011-03-14 12:55:55 +00:00
|
|
|
build.xml.script.CRC32=a0136781
|
2014-06-11 22:19:35 +02:00
|
|
|
build.xml.stylesheet.CRC32=a56c6a5b@2.66.1
|
2011-03-14 12:55:55 +00:00
|
|
|
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
|
|
|
|
|
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
|
2014-06-11 22:19:35 +02:00
|
|
|
nbproject/build-impl.xml.data.CRC32=971927a9
|
2011-03-14 12:55:55 +00:00
|
|
|
nbproject/build-impl.xml.script.CRC32=55a34aaf
|
2014-06-11 22:19:35 +02:00
|
|
|
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.66.1
|
2014-08-30 12:08:35 +02:00
|
|
|
=======
|
2015-01-23 13:57:06 +01:00
|
|
|
build.xml.data.CRC32=6698ec34
|
2014-08-30 12:08:35 +02:00
|
|
|
build.xml.script.CRC32=a0136781
|
2015-01-23 13:57:06 +01:00
|
|
|
build.xml.stylesheet.CRC32=a56c6a5b@2.67.1
|
2014-08-30 12:08:35 +02:00
|
|
|
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
|
|
|
|
|
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
|
2015-01-23 13:57:06 +01:00
|
|
|
nbproject/build-impl.xml.data.CRC32=6698ec34
|
2014-08-30 12:08:35 +02:00
|
|
|
nbproject/build-impl.xml.script.CRC32=55a34aaf
|
2015-01-23 13:57:06 +01:00
|
|
|
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.67.1
|
2014-08-30 12:08:35 +02:00
|
|
|
>>>>>>> experimental
|
