summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorJoel Fischer <joeljfischer@gmail.com>2020-12-04 10:35:30 -0500
committerJoel Fischer <joeljfischer@gmail.com>2020-12-04 10:35:30 -0500
commitc5ead612382a69fb0fdee2de7d4e9afefc27783a (patch)
tree26ddc98efeb1f6fc2c8285c768244a5b3c990f49 /.github
parent89b29de98a5731bfa9d72afdac012b3ed5a8f5a8 (diff)
parent67ca794e1e9a6d9fab2722b942b4780be9ad2c5e (diff)
downloadsdl_ios-c5ead612382a69fb0fdee2de7d4e9afefc27783a.tar.gz
Merge branch 'master' into develop
Diffstat (limited to '.github')
-rw-r--r--.github/PULL_REQUEST_TEMPLATE.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index a980c7629..3a169cd81 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
[Things to note: Pull Requests **must** fix an issue. Discussion about the feature / bug takes place in the issue, discussion of the implementation takes place in the PR. Please also see the [Contributing Guide](https://github.com/smartdevicelink/sdl_ios/blob/master/.github/CONTRIBUTING.md) for information on branch naming and the CLA, and the [SmartDeviceLink GitHub Best Practices](https://d83tozu1c8tt6.cloudfront.net/media/resources/SDL_GitHub_BestPractices.pdf) document for more information on how to enter a pull request. Please create the PR as a draft until it is ready for review. Once this PR is ready for review, please request one from @smartdevicelink/ios and mark the PR as ready for review.
-Also, remember that all new public file headers should be added as public in the `File Inspector / Target Membership` pane, added to `SmartDeviceLink.h` and to *both* `.podspec` files.
+Also, remember that all new public file headers should be added as public in the `File Inspector / Target Membership` pane, placed in the `SmartDeviceLink/public` folder on the file system, and added to `SmartDeviceLink.h`. Private files should be placed in the `SmartDeviceLink/private` folder.
Delete the above section when you've read it.]