This commit is contained in:
clementine.desrucques
2021-10-19 08:55:06 +02:00
commit 8b2130a5cf
25 changed files with 2806 additions and 0 deletions

View File

@@ -0,0 +1,17 @@
<<<<<<< HEAD
build.xml.data.CRC32=a917c93e
=======
build.xml.data.CRC32=6d18b965
>>>>>>> origin/master
build.xml.script.CRC32=9531f85e
build.xml.stylesheet.CRC32=1707db4f@1.86.0.1
# 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.
<<<<<<< HEAD
nbproject/build-impl.xml.data.CRC32=a917c93e
nbproject/build-impl.xml.script.CRC32=33be3f4b
=======
nbproject/build-impl.xml.data.CRC32=6d18b965
nbproject/build-impl.xml.script.CRC32=6afad90d
>>>>>>> origin/master
nbproject/build-impl.xml.stylesheet.CRC32=334708a0@1.86.0.1