Update gitignore

matthewpalmer · Sep 12, 2015 · e79e4ae · e79e4ae
1 parent f2b44e6
commit e79e4ae
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,13 +26,10 @@ DerivedData
 #
 # Pods/
 =======
-*.xcworkspace
-!default.xcworkspace
 xcuserdata
 profile
 *.moved-aside
 DerivedData
 .idea/
 # Pods - for those of you who use CocoaPods
 Pods
->>>>>>> a8d082ca0a00018a7df906eca307a0961fbd4357
diff --git a/Locksmith.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Locksmith.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Locksmith.xcworkspace/contents.xcworkspacedata b/Locksmith.xcworkspace/contents.xcworkspacedata