.gitignore

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

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

# 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/
=======
*.xcworkspace
!default.xcworkspace
xcuserdata
profile
*.moved-aside
DerivedData
.idea/
Pods
>>>>>>> 1c4acaba914c1bcb2c9abf6ae49ca07b1dea1f02