Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/synchronize upstream #34

Merged
merged 3 commits into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#### Summary

<!--- required --->

#### Reasoning

<!--- required --->
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1808,7 +1808,7 @@ _You can enable the following settings in Xcode by running [this script](resourc
let composition = AtmosphereComposition(nitrogen: 0.78, oxygen: 0.22)

/// Generate the `atmosphere` first, **then** the `oceans`. Otherwise, the water will just boil off immediately.
/// - Comments not preceeding declarations can use doc comments, and will not be autocorrected into regular comments.
/// - Comments not preceding declarations can use doc comments, and will not be autocorrected into regular comments.
/// This can be useful because Xcode applies markdown styling to doc comments but not regular comments.
generateAtmosphere(using: composition)
generateOceans()
Expand Down Expand Up @@ -1837,7 +1837,7 @@ _You can enable the following settings in Xcode by running [this script](resourc
}
```

Regular comments are also allowed before a grouped block of delcarations, since it's possible that the comment refers to the block as a whole rather than just the following declaration:
Regular comments are also allowed before a grouped block of declarations, since it's possible that the comment refers to the block as a whole rather than just the following declaration:

```swift
// RIGHT
Expand Down
Loading