Skip to content
Snippets Groups Projects
Commit d49a54e1 authored by kondeichmann's avatar kondeichmann
Browse files

remove conflict fragment from .gitignore

parent 05791c6f
Branches
Tags
1 merge request!8Hockey app integration
...@@ -41,4 +41,3 @@ DerivedData ...@@ -41,4 +41,3 @@ DerivedData
DerivedData.noindex DerivedData.noindex
*.xcuserstate *.xcuserstate
*.swp *.swp
>>>>>>> master
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment