Projects >> spock >>78f4a6e22c392577d3a71bc9c45590b3be8f991a

Chunk
Conflicting content
    InputStream stream = new BufferedInputStream(new FileInputStream(file));
    try {
      SpecClassFileVisitor visitor = new SpecClassFileVisitor();
<<<<<<< HEAD
      reader.accept(visitor, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
=======
      AsmClassReader reader = new AsmClassReader(stream);
      reader.accept(visitor);
>>>>>>> b3e2ca407a7bbb4e5484c22827d52bf379e811c2
      return visitor.isRunnableSpec();
    } finally {
      stream.close();
Solution content
    InputStream stream = new BufferedInputStream(new FileInputStream(file));
    try {
      SpecClassFileVisitor visitor = new SpecClassFileVisitor();
      AsmClassReader reader = new AsmClassReader(stream);
      reader.accept(visitor);
      return visitor.isRunnableSpec();
    } finally {
      stream.close();
File
SpecClassFileFinder.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable