# Conflicts: # .gitignore # project.private.config.json
@@ -2,4 +2,9 @@
/.idea
+<<<<<<< HEAD
project.config.json
+=======
+/project.config.json
+/project.private.config.json
+>>>>>>> 09e9097ee0b0f3d417e15b7d3d83a8e59a5ae3e1