.gitignore.orig

.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