Fix merge conflict mistakes #2080
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
✅ Deploy Preview for privacyguides ready!
To edit notification comments on pull requests, go to your Netlify site settings. |
jonaharagon
added a commit
that referenced
this pull request
Mar 9, 2023
jonaharagon
force-pushed
the
jonaharagon/merge-conflict-fixes
branch
from
254f764
to
ecdd1bc
Compare
jonaharagon
added a commit
that referenced
this pull request
Mar 9, 2023
jonaharagon
force-pushed
the
jonaharagon/merge-conflict-fixes
branch
from
ecdd1bc
to
611833f
Compare
dngray
approved these changes
Mar 10, 2023
Signed-off-by: Daniel Gray <dngray@privacyguides.org>
dngray
force-pushed
the
jonaharagon/merge-conflict-fixes
branch
from
611833f
to
3955114
Compare
|
This pull request has been mentioned on Privacy Guides. There might be relevant details there: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When #2078 was merged it overwrote changes made in #1068 which weren't saved properly :(