jkrdev commented on issue #341: ACCUMULO-3902 Ensure [Batch]Scanners are closed in ITs URL: https://github.com/apache/accumulo/pull/341#issuecomment-354006674 I see that the conflicting file no longer exist in the master branch, I am not sure what I did to cause this conflict but if it is messing up the ability for the jenkins and travis to run then how do I fix the conflict? (I can delete the file but I feel as though that is not the proper way).
---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
