Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove merge conflict marks #12546

Merged
merged 1 commit into from Nov 7, 2019

Conversation

@h00die
Copy link
Contributor

h00die commented Nov 7, 2019

Accidentally didn't resolve all conflicts in gemfile.lock when merging, this removes the conflict marks.

@h00die h00die merged commit 6b472b6 into rapid7:master Nov 7, 2019
1 of 3 checks passed
1 of 3 checks passed
Metasploit Automation - Sanity Test Execution Build triggered for merge commit.
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
Metasploit Automation - Test Execution Successfully completed all tests.
Details
h00die added a commit that referenced this pull request Nov 7, 2019
@h00die h00die self-assigned this Nov 7, 2019
@h00die h00die added the bug label Nov 7, 2019
@h00die h00die deleted the h00die:fix79 branch Nov 7, 2019
jmartin-r7 added a commit that referenced this pull request Nov 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.