Skip to content

Commit d46d696

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents f2fcf00 + 90e91f5 commit d46d696

File tree

4 files changed

+202
-58
lines changed

4 files changed

+202
-58
lines changed

.gitignore

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# Xcode
2+
#
3+
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
4+
5+
## Build generated
6+
build/
7+
DerivedData
8+
9+
## Various settings
10+
*.pbxuser
11+
!default.pbxuser
12+
*.mode1v3
13+
!default.mode1v3
14+
*.mode2v3
15+
!default.mode2v3
16+
*.perspectivev3
17+
!default.perspectivev3
18+
xcuserdata
19+
20+
## Other
21+
*.xccheckout
22+
*.moved-aside
23+
*.xcuserstate
24+
*.xcscmblueprint
25+
26+
## Obj-C/Swift specific
27+
*.hmap
28+
*.ipa
29+
30+
## Playgrounds
31+
timeline.xctimeline
32+
playground.xcworkspace
33+
34+
# Swift Package Manager
35+
.build
36+
Packages
37+
38+
# CocoaPods
39+
#
40+
# We recommend against adding the Pods directory to your .gitignore. However
41+
# you should judge for yourself, the pros and cons are mentioned at:
42+
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
43+
#
44+
# Pods/
45+
46+
# Carthage
47+
#
48+
# Add this line if you want to avoid checking in source code from Carthage dependencies.
49+
# Carthage/Checkouts
50+
51+
Carthage/Build
52+
53+
# macOS
54+
.DS_Store

0 commit comments

Comments
 (0)