.gitignore

<<<<<<< HEAD
# OS X
.DS_Store

# Xcode
=======
# Xcode
#
>>>>>>> 5d624640335ae28d2e1bdeafbf646fa2eda0116d
build/
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
*.xccheckout
<<<<<<< HEAD
profile
=======
>>>>>>> 5d624640335ae28d2e1bdeafbf646fa2eda0116d
*.moved-aside
DerivedData
*.hmap
*.ipa
<<<<<<< HEAD

# Bundler
.bundle

Carthage
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
# 
# Note: if you ignore the Pods directory, make sure to uncomment
# `pod install` in .travis.yml
#
# Pods/
=======
*.xcuserstate

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
#
#Pods/
>>>>>>> 5d624640335ae28d2e1bdeafbf646fa2eda0116d