Skip to content

Commit 82a67ec

Browse files
committed
chore: resolve conflicts from develop
2 parents 65e1255 + 8872231 commit 82a67ec

File tree

2,345 files changed

+17216
-95985
lines changed

Some content is hidden

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

2,345 files changed

+17216
-95985
lines changed

β€Ž.github/workflows/release.ymlβ€Ž

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v2
1616
with:
17-
token: ${{ secrets.DOCUSAURUS_GH_TOKEN }}
1817
# pulls all commits (needed for semantic release to correctly version)
1918
fetch-depth: '0'
2019
# pulls all tags (needed for semantic release to correctly version)
@@ -36,7 +35,6 @@ jobs:
3635
run: yarn release
3736
env:
3837
NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
39-
GH_TOKEN: ${{ secrets.DOCUSAURUS_GH_TOKEN }}
4038
- name: Merge back changes
4139
run: |
4240
git stash

β€Ž.github/workflows/sample-distribution.ymlβ€Ž

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ jobs:
3434
- name: iOS Pods setup
3535
working-directory: examples/SampleApp/ios
3636
run: |
37-
pod update hermes-engine --no-repo-update
37+
rm -rf Pods
38+
rm -f Podfile.lock
39+
rm -rf build
40+
rm -rf ~/Library/Developer/Xcode/DerivedData
3841
bundle exec pod install
3942
- name: Build and release Testflight QA
4043
working-directory: examples/SampleApp

β€Ž.gitignoreβ€Ž

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,3 @@ index.android.bundle
2323
*.app
2424
*.DSYM.zip
2525
**/metrics/
26-
27-
#docusaurus
28-
docusaurus/shared

β€ŽREADME.mdβ€Ž

Lines changed: 1 addition & 1 deletion

β€Ždocusaurus/docs/reactnative/additional-resources/libraries.mdxβ€Ž

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

β€Ždocusaurus/docs/reactnative/additional-resources/stream.mdxβ€Ž

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

β€Ždocusaurus/docs/reactnative/additional-resources/technologies_and_techniques.mdxβ€Ž

Lines changed: 0 additions & 21 deletions
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
Β (0)