Skip to content

Commit 40fbff9

Browse files
committed
Track 'main' to resolve a merge conflict.
2 parents 5dab09b + b20a23e commit 40fbff9

Some content is hidden

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

43 files changed

+3292
-2489
lines changed

Sources/TSPL/TSPL.docc/GuidedTour/AboutSwift.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
2-
31
# About Swift
42

53
Understand the high-level goals of the language.
@@ -50,7 +48,6 @@ and it continues to evolve with new features and capabilities.
5048
Our goals for Swift are ambitious.
5149
We can’t wait to see what you create with it.
5250

53-
5451
<!--
5552
This source file is part of the Swift.org open source project
5653

Sources/TSPL/TSPL.docc/GuidedTour/Compatibility.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
2-
31
# Version Compatibility
42

53
Learn what functionality is available in older language modes.
@@ -51,7 +49,6 @@ that's divided into multiple frameworks,
5149
you can migrate your code from Swift 4 to Swift 5.7
5250
one framework at a time.
5351

54-
5552
<!--
5653
This source file is part of the Swift.org open source project
5754

0 commit comments

Comments
 (0)