]> source.dussan.org Git - gitignore.git/commitdiff
projects / gitignore.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 182aeb2 7bbc288)
Merge branch 'master' into patch-1 636/head
authorMichael Gerbush <michaelg@spiceworks.com>
Thu, 7 Nov 2013 19:04:32 +0000 (13:04 -0600)
committerMichael Gerbush <michaelg@spiceworks.com>
Thu, 7 Nov 2013 19:04:32 +0000 (13:04 -0600)
Conflicts:
Objective-C.gitignore

1  2 
Objective-C.gitignore patch | diff1 | diff2 | blob | history

diff --cc Objective-C.gitignore
index 6a32919883a88d3470afc43146d6f0cb810bbe95,d1b15a361cd09665d15ff670ebffe17044a72f64..8dcee63eff28595c2f73c8cfc72fc3ba62743fe3
--- 1/Objective-C.gitignore
--- 2/Objective-C.gitignore
+++ b/Objective-C.gitignore
@@@ -1,6 -1,8 +1,8 @@@
- # Xcode
+ # OS X
  .DS_Store
 -*/build/*
+ 
+ # Xcode
 +build/
  *.pbxuser
  !default.pbxuser
  *.mode1v3
A collection of useful .gitignore templates: https://github.com/github/gitignore