Merge branch 'rewrites/jpa'

[pizzaservice-core.git] / PizzaService-ejb / nbproject / genfiles.properties

diff --git a/PizzaService-ejb/nbproject/genfiles.properties b/PizzaService-ejb/nbproject/genfiles.properties
index 8edc767ea91742afa66f607ad32eac81f6af1d18..1b8f2e487d2b8941006350e8ccd029611428e24d 100644 (file)
--- a/PizzaService-ejb/nbproject/genfiles.properties
+++ b/PizzaService-ejb/nbproject/genfiles.properties
@@ -3,6 +3,11 @@ build.xml.script.CRC32=cabe2e92
 build.xml.stylesheet.CRC32=5910fda3@1.51.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=2efd3682
+nbproject/build-impl.xml.script.CRC32=d1bf7afb
+=======
 nbproject/build-impl.xml.data.CRC32=a9327adf
 nbproject/build-impl.xml.script.CRC32=0299efaf
+>>>>>>> rewrites/jpa
 nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.51.1