Merge pull request github#1040 from NSElvis/master

Ignore xcuserstate
albsama · Apr 16, 2014 · fe0df60 · fe0df60
2 parents 8032406 + 37372e0
commit fe0df60
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/Global/Xcode.gitignore b/Global/Xcode.gitignore
@@ -11,3 +11,4 @@ xcuserdata
 *.xccheckout
 *.moved-aside
 DerivedData
+*.xcuserstate
diff --git a/Objective-C.gitignore b/Objective-C.gitignore
@@ -15,6 +15,7 @@ xcuserdata
 DerivedData
 *.hmap
 *.ipa
+*.xcuserstate
 
 # CocoaPods
 #
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ xcuserdata @@
     DerivedData
     *.hmap
     *.ipa
+    *.xcuserstate
     # CocoaPods
     #
@@ Expand Down @@