.gitignore 2.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123
  1. <<<<<<< HEAD
  2. # OS X
  3. .DS_Store
  4. # Xcode
  5. build/
  6. =======
  7. # ---> Swift
  8. # Xcode
  9. #
  10. # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
  11. ## Build generated
  12. build/
  13. DerivedData
  14. ## Various settings
  15. >>>>>>> b2ba1ce6ee13d93a4136f9bbd279495c6515309d
  16. *.pbxuser
  17. !default.pbxuser
  18. *.mode1v3
  19. !default.mode1v3
  20. *.mode2v3
  21. !default.mode2v3
  22. *.perspectivev3
  23. !default.perspectivev3
  24. <<<<<<< HEAD
  25. xcuserdata/
  26. *.xccheckout
  27. profile
  28. *.moved-aside
  29. DerivedData
  30. *.hmap
  31. *.ipa
  32. # Bundler
  33. .bundle
  34. =======
  35. xcuserdata
  36. ## Other
  37. *.xccheckout
  38. *.moved-aside
  39. *.xcuserstate
  40. *.xcscmblueprint
  41. ## Obj-C/Swift specific
  42. *.hmap
  43. *.ipa
  44. # CocoaPods
  45. #
  46. # We recommend against adding the Pods directory to your .gitignore. However
  47. # you should judge for yourself, the pros and cons are mentioned at:
  48. # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
  49. #
  50. # Pods/
  51. # Carthage
  52. #
  53. >>>>>>> b2ba1ce6ee13d93a4136f9bbd279495c6515309d
  54. # Add this line if you want to avoid checking in source code from Carthage dependencies.
  55. # Carthage/Checkouts
  56. Carthage/Build
  57. <<<<<<< HEAD
  58. # We recommend against adding the Pods directory to your .gitignore. However
  59. # you should judge for yourself, the pros and cons are mentioned at:
  60. # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
  61. #
  62. # Note: if you ignore the Pods directory, make sure to uncomment
  63. # `pod install` in .travis.yml
  64. #
  65. # Pods/
  66. =======
  67. # ---> Objective-C
  68. # Xcode
  69. #
  70. # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
  71. ## Build generated
  72. build/
  73. DerivedData
  74. ## Various settings
  75. *.pbxuser
  76. !default.pbxuser
  77. *.mode1v3
  78. !default.mode1v3
  79. *.mode2v3
  80. !default.mode2v3
  81. *.perspectivev3
  82. !default.perspectivev3
  83. xcuserdata
  84. ## Other
  85. *.xccheckout
  86. *.moved-aside
  87. *.xcuserstate
  88. *.xcscmblueprint
  89. ## Obj-C/Swift specific
  90. *.hmap
  91. *.ipa
  92. # CocoaPods
  93. #
  94. # We recommend against adding the Pods directory to your .gitignore. However
  95. # you should judge for yourself, the pros and cons are mentioned at:
  96. # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
  97. #
  98. #Pods/
  99. # Carthage
  100. #
  101. # Add this line if you want to avoid checking in source code from Carthage dependencies.
  102. # Carthage/Checkouts
  103. Carthage/Build
  104. >>>>>>> b2ba1ce6ee13d93a4136f9bbd279495c6515309d