remove conflict fragment from .gitignore

d49a54e1 · kondeichmann · 05791c6f · d49a54e1
Commit d49a54e1 authored 7 years ago by kondeichmann
--- a/.gitignore
+++ b/.gitignore
@@ -41,4 +41,3 @@ DerivedData
 DerivedData.noindex
 *.xcuserstate
 *.swp
->>>>>>> master