Skip to content

Resolve merge conflict#107

Merged
awest1339 merged 2 commits intomitre:masterfrom
ptcNOP:hotfix/nsrl_parse_merge_conflict
Mar 15, 2018
Merged

Resolve merge conflict#107
awest1339 merged 2 commits intomitre:masterfrom
ptcNOP:hotfix/nsrl_parse_merge_conflict

Conversation

@ptcNOP
Copy link
Contributor

@ptcNOP ptcNOP commented Mar 15, 2018

Not sure how this made it through CI...

@ptcNOP ptcNOP requested a review from awest1339 March 15, 2018 16:28
@ptcNOP
Copy link
Contributor Author

ptcNOP commented Mar 15, 2018

Should bumpversion (v1.1.1) and tag commit.

Copy link
Contributor

@awest1339 awest1339 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good. Would you like to run bumpversion in this PR?

@ptcNOP
Copy link
Contributor Author

ptcNOP commented Mar 15, 2018

Done. Commit msg is a little misleading because a bump version was missed, but not really a big deal.

@awest1339 awest1339 merged commit 7fb07b5 into mitre:master Mar 15, 2018
@ptcNOP ptcNOP deleted the hotfix/nsrl_parse_merge_conflict branch June 10, 2018 21:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants