677 pjg obsdic #678
Merged
677 pjg obsdic #678
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
added 2 commits
January 20, 2021 14:12
|
@acordonez @lee1043 I'm confused by the "conflicting file" above. Why can't we just update/replace the version.py? Any ideas? |
|
@gleckler1 Did version.py get updated in master since you created your branch? That might cause a conflict. |
|
@acordonez I'm not sure, and in any case don't understand the reasons or implications for doing this. But I have cp version.py from master, pushed again, and am awaiting tests again. |
|
@acordonez @lee1043 looks like this one is good to go... |
lee1043
approved these changes
Jan 22, 2021
Closed
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.
No description provided.