diff options
| author | Abhishek Kumar Singh <abhishek4bhopati@gmail.com> | 2016-03-07 11:51:09 +0530 |
|---|---|---|
| committer | Abhishek Kumar Singh <abhishek4bhopati@gmail.com> | 2016-03-07 11:51:09 +0530 |
| commit | 83656adb097d1e5fb674918287c2af3459ed7fce (patch) | |
| tree | 5b72a8087a79fa8c35edd8f68efdfbedb0ec2bc9 /Swift.gitignore | |
| parent | a623e9e6d4a52163b705826ff27e7999159a47e1 (diff) | |
| parent | 028ed4e1b12b21c533be67180b6aefbbba072717 (diff) | |
| download | gitignore-83656adb097d1e5fb674918287c2af3459ed7fce.tar.gz gitignore-83656adb097d1e5fb674918287c2af3459ed7fce.zip | |
Merge branch 'master' of github.com:github/gitignore into patch-1
Conflicts:
Python.gitignore
Diffstat (limited to 'Swift.gitignore')
| -rw-r--r-- | Swift.gitignore | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Swift.gitignore b/Swift.gitignore index 9724b3c6..aa5b516c 100644 --- a/Swift.gitignore +++ b/Swift.gitignore @@ -19,8 +19,7 @@ xcuserdata/ ## Other *.moved-aside -*.xccheckout -*.xcscmblueprint +*.xcuserstate ## Obj-C/Swift specific *.hmap |