Skip to content

Commit ea3f7a5

Browse files
amartini51amartini51
committed
Track 'main' to resolve merge conflict.
The file 'footer.html' was created on this branch inside a directory that was renamed on 'main'. Resolved the conflict by moving it, to follow where the .docc ended up.
2 parents e88cd6e + cd5d200 commit ea3f7a5

File tree

184 files changed

+206
-60
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+206
-60
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
.DS_Store
2+
.docc-build
23
.swiftpm
34
/.build
45
/Package.resolved
5-
.docc-build
6+
/TSPL.docc/header.html
7+
/swift-book

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion

‎Makefile‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎Package.swift‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎README.md‎

Lines changed: 1 addition & 1 deletion

‎Sources/TSPL/EmptyFile.swift‎

Whitespace-only changes.

‎Sources/TSPL/TSPL.docc/Assets/cover_opensource.jpg‎

-388 KB
Binary file not shown.

‎Sources/TSPL/TSPL.docc/Assets/referenceCycle01~dark@2x.png‎

-39.2 KB
Binary file not shown.

Sources/TSPL/TSPL.docc/Assets/CollectionTypes_intro_2x.png renamed to TSPL.docc/Assets/CollectionTypes_intro_2x.png

File renamed without changes.

Sources/TSPL/TSPL.docc/Assets/CollectionTypes_intro~dark@2x.png renamed to TSPL.docc/Assets/CollectionTypes_intro~dark@2x.png

File renamed without changes.

0 commit comments

Comments
 (0)