diff options
| author |  thinkerou <thinkerou@gmail.com> | 2016-07-09 11:24:30 +0800 |
|---|---|---|
| committer | thinkerou <thinkerou@gmail.com> | 2016-07-09 11:27:52 +0800 |
| commit | 52664ccee592f884435a668b9d4da25f62b4eca3 (patch) | |
| tree | ec09c014f03d6e6b46feb00588b870c7d9cee3e3 /.gitignore | |
| parent | c1bfe124ab0d151f7619f4fefc08244bd1dd4750 (diff) | |
Fix orig files for conflicting generated
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index f37989176e..09223fa1ea 100644 --- a/.gitignore +++ b/.gitignore @@ -96,3 +96,6 @@ Pods/ # Artifacts directory artifacts/ + +# Git generated files for conflicting +*.orig |