| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123 | 
							- <<<<<<< HEAD
 
- # OS X
 
- .DS_Store
 
- # Xcode
 
- build/
 
- =======
 
- # ---> Swift
 
- # Xcode
 
- #
 
- # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 
- ## Build generated
 
- build/
 
- DerivedData
 
- ## Various settings
 
- >>>>>>> b2ba1ce6ee13d93a4136f9bbd279495c6515309d
 
- *.pbxuser
 
- !default.pbxuser
 
- *.mode1v3
 
- !default.mode1v3
 
- *.mode2v3
 
- !default.mode2v3
 
- *.perspectivev3
 
- !default.perspectivev3
 
- <<<<<<< HEAD
 
- xcuserdata/
 
- *.xccheckout
 
- profile
 
- *.moved-aside
 
- DerivedData
 
- *.hmap
 
- *.ipa
 
- # Bundler
 
- .bundle
 
- =======
 
- xcuserdata
 
- ## Other
 
- *.xccheckout
 
- *.moved-aside
 
- *.xcuserstate
 
- *.xcscmblueprint
 
- ## Obj-C/Swift specific
 
- *.hmap
 
- *.ipa
 
- # 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/
 
- # Carthage
 
- #
 
- >>>>>>> b2ba1ce6ee13d93a4136f9bbd279495c6515309d
 
- # Add this line if you want to avoid checking in source code from Carthage dependencies.
 
- # Carthage/Checkouts
 
- Carthage/Build
 
- <<<<<<< HEAD
 
- # We recommend against adding the Pods directory to your .gitignore. However
 
- # you should judge for yourself, the pros and cons are mentioned at:
 
- # https://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/
 
- =======
 
- # ---> Objective-C
 
- # Xcode
 
- #
 
- # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 
- ## Build generated
 
- build/
 
- DerivedData
 
- ## Various settings
 
- *.pbxuser
 
- !default.pbxuser
 
- *.mode1v3
 
- !default.mode1v3
 
- *.mode2v3
 
- !default.mode2v3
 
- *.perspectivev3
 
- !default.perspectivev3
 
- xcuserdata
 
- ## Other
 
- *.xccheckout
 
- *.moved-aside
 
- *.xcuserstate
 
- *.xcscmblueprint
 
- ## Obj-C/Swift specific
 
- *.hmap
 
- *.ipa
 
- # 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-check-the-pods-directory-into-source-control
 
- #
 
- #Pods/
 
- # Carthage
 
- #
 
- # Add this line if you want to avoid checking in source code from Carthage dependencies.
 
- # Carthage/Checkouts
 
- Carthage/Build
 
- >>>>>>> b2ba1ce6ee13d93a4136f9bbd279495c6515309d
 
 
  |