Testscriptswolf #7
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
apcraig
approved these changes
Jun 8, 2017
|
So, I had to resolve the conflict before I could pull. I resolved it on the github page directly and did the commit there. It seems to have worked. Will now execute the PR. |
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.
There are two different things in this pull request, changes to the testing scripts for wolf and the change to the README.md file, which I pushed (on the wrong branch) by mistake. There's an artificial conflict in the README.md file (might be whitespace?) which shouldn't matter; I haven't figured out how to remove the commit or make the pull request only include the changes for wolf. Fixing this looks pretty complicated. So maybe just let it all go through together? And then maybe we should provide instructions on what NOT to do... (I'm learning)