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

closes #16 #25

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

closes #16 #25

wants to merge 6 commits into from

Conversation

cleidir
Copy link

@cleidir cleidir commented Jul 24, 2017

No description provided.

@wasadigi
Copy link
Member

Could you please remove the conflicting files from this PR? I accepted a PR from another dev, so you need to pull master from the upstream repo.

@wasadigi
Copy link
Member

Hi, I would like to accept this PR, but I can't right now. There are conflicting files (see comments provided by GitHub). Can you please remove the IInstrument.java and 3 other files from your PR (for instance with git revert). Thanks!

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