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
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 1 deletion
.gitignore
+ 0
− 1
View file @ d49a54e1
...@@ -41,4 +41,3 @@ DerivedData ...@@ -41,4 +41,3 @@ DerivedData
DerivedData.noindex DerivedData.noindex
*.xcuserstate *.xcuserstate
*.swp *.swp
>>>>>>> master
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment