Add temp pom entry to gitignore

szarnyasg · szarnyasg · commit c5bb8cb2a0d9 · 2020-09-14T23:36:55.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -4,8 +4,6 @@
 *.jar
 *.war
 *.ear
-<<<<<<< HEAD
-=======
 *.pyc
 *.iml
 
@@ -57,4 +55,4 @@ datagen_output/
 # configuration file
 params.ini
 dependency-reduced-pom.xml
->>>>>>> 4d932139... Add temp pom entry to gitignore
+
