Permalink
Browse files

Fixed .gitignore

  • Loading branch information...
1 parent f1ec840 commit d82243cbf7403f602ca7700fbbbb5583339cc7fc Owain R Hunt committed Jan 21, 2012
Showing with 22 additions and 0 deletions.
  1. +22 −0 .gitignore.orig
View
@@ -0,0 +1,22 @@
+.DS_Store
+*.swp
+*~.nib
+
+build/
+
+*.pbxuser
+*.perspective
+*.perspectivev3
+
+*.mode1v3
+*.mode2v3
+/UAGithubEngine.xcodeproj/xcuserdata/owainhunt.xcuserdatad/xcschemes/UAGithubEngine.xcscheme
+/UAGithubEngine.xcodeproj/project.xcworkspace/xcuserdata/owainhunt.xcuserdatad/UserInterfaceState.xcuserstate
+/UAGithubEngine.xcodeproj/xcuserdata/mlussier.xcuserdatad/
+<<<<<<< HEAD
+UserInterfaceState.xcuserstate
+=======
+/UAGithubEngine.xcodeproj/xcuserdata/orhunt.xcuserdatad/
+/UAGithubEngine.xcodeproj/project.xcworkspace/xcuserdata/orhunt.xcuserdatad/
+/AppController.m
+>>>>>>> refs/heads/api3-blocks-arc

0 comments on commit d82243c

Please sign in to comment.