aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 1f191e5..16e54e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,8 @@
!var/SymfonyRequirements.php
/vendor/
/web/bundles/
+<<<<<<< HEAD
.idea
+=======
+/.idea/
+>>>>>>> 72114be2d32b090f68996acb87cef7fde748b534