@@ -10,10 +10,6 @@ bin
.idea/
customerdata/.DS_Store
customerdata/src/.DS_Store
-<<<<<<< HEAD
customerdata/.idea/
customerdata/pkg/
sqlutil/pkg
-=======
-.idea
->>>>>>> dev-ent-sxf
