Projects >> mx >>fd3768d1fbfed3557c86794f59a50cf8443e216f

Chunk
Conflicting content 
    suite.addTestSuite(PathEdgeTest.class);
    suite.addTestSuite(PathGraphTest.class);
    suite.addTestSuite(HanserRingFinderTest.class);
<<<<<<< HEAD
    suite.addTestSuite(DefaultAtomMatcherTest.class);
    suite.addTestSuite(QueryTest.class);
    suite.addTestSuite(DefaultQueryMapperTest.class);
    
    suite.addTestSuite(QueryDefaultStateTest.class);
=======
    suite.addTestSuite(SubstructureTest.class);
    suite.addTestSuite(MolfileWriterTest.class);
>>>>>>> 20237a88c7d4bdfbbb46e2bfb14d0ec8a9bcab3d

    TestRunner.run(suite);
  }
Solution content 
    suite.addTestSuite(PathEdgeTest.class);
    suite.addTestSuite(PathGraphTest.class);
    suite.addTestSuite(HanserRingFinderTest.class);
    suite.addTestSuite(DefaultAtomMatcherTest.class);
    suite.addTestSuite(QueryTest.class);
    suite.addTestSuite(DefaultQueryMapperTest.class);
    suite.addTestSuite(QueryDefaultStateTest.class);
    suite.addTestSuite(SuperatomTest.class);
    suite.addTestSuite(MolfileWriterTest.class);

    TestRunner.run(suite);
  }
File
MXTest.java
Developer's decision
Manual
Kind of conflict
Method invocation