This repository was archived by the owner on Dec 5, 2023. It is now read-only.
Changing Socks Shop to Sock Shop #60
Merged
Conversation
This file contains hidden or 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
Contributor
Author
|
Please note that the conflicts should all be resolved to use singular "sock" instead of "socks" |
This was referenced Apr 13, 2017
Merged
Contributor
|
@rberlind this PR has conflicts |
Contributor
Author
|
Hi @jasonrichardsmith. I saw that, but don't understand why they occurred. I'm the only one to have edited the Apcera.md file and the conflicts should be resolved to use singular "sock" instead of "socks". Is that something you can manually do? Or can you suggest the procedure for me to fix it? Thanks, |
Contributor
Author
|
will close and re-open to see if the conflicts are resolved. |
…mo.github.io deleted extra copy of apcera.md Trying to resolve conflicts
Contributor
Author
|
OK. I was able to fix it. Please go ahead and merge when you have time. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
I'm changing Socks Shop to Sock Shop in apcera.md to conform to today's decision to standardize usage of "Sock Shop". I am also updating files in microservices-demo repository under deploy/apcera to conform in separate pull request in that repository.