Fix conflicts in pull request #43 #1
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
This allows programs using Airline to have systems like Guice or Dagger instantiate commands for use with Airline.
Where a command factory is used to produce singleton commands, this change will allow the command to be reconfigured before execution.
Previous version of Jacoco could not parse Java8 byte code and would fail the build. Fixes airlift#46
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.
This refers to your pull request airlift#43 for removing Guava dependency, which is now showing conflicts and cannot be merged.
This pull request fixes those conflicts - I had done that for my own fork and thus thought of raising this one.