Revert errored merge of deea30d #4175
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
Revert "Merge branch 'master' of https://github.com/farias-r7/metasploit-framework into upstream-master" This reverts commit deea30d, reversing changes made to 14514d7.
|
Ah, @farias-r7 has confirmed on IRC that it was an error. Please merge this toot sweet to avoid compounding breakage. |
|
ty @wvu-r7 |
todb-r7
pushed a commit
to todb-r7/metasploit-framework
that referenced
this pull request
Nov 11, 2014
|
This removes the work done in #4113. |
Merged
todb-r7
pushed a commit
to todb-r7/metasploit-framework
that referenced
this pull request
Nov 11, 2014
2 tasks
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.
Revert "Merge branch 'master' of https://github.com/farias-r7/metasploit-framework into upstream-master"
This merge looks like it was done in error, so revert it, please. Not sure what's fixed (or broken!) with this. See the comment on the commit, here: