Avoid duplicates in gitignore

(cherry picked from commit ce5e0f1) # Conflicts: # .gitignore
playframework · Feb 27, 2024 · ce5ef8d · ce5ef8d
1 parent 4b89f5e
commit ce5ef8d
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,10 +14,13 @@ project/plugins/project/
 .scala_dependencies
 .idea
 
+<<<<<<< HEAD
 .bloop/
 <<<<<<< HEAD
 =======
 
+=======
+>>>>>>> ce5e0f1 (Avoid duplicates in gitignore)
 compiler/version.properties
 
 .vscode/
@@ -27,7 +30,10 @@ compiler/version.properties
 .bloop/
 project/metals.sbt
 metals.sbt
+<<<<<<< HEAD
 
 # BSP
 .bsp/*
 >>>>>>> c9bef0a (compiler: account for Scala 2 and 3 differences in generated vararg code)
+=======
+>>>>>>> ce5e0f1 (Avoid duplicates in gitignore)