Projects >> bio4j >>98d69355d5d259398784b23689a4a4d81ba0829b

Chunk
Conflicting content
package com.bio4j.model.util;

<<<<<<< HEAD
public interface NodeRetriever{}
=======
public interface NodeRetriever {
  // public N getNode();
}
>>>>>>> bb521654dcddba2975eeb4e42fb36a95ea4fc50d
Solution content
package com.bio4j.model.util;

public interface NodeRetriever{}
File
NodeRetriever.java
Developer's decision
Version 1
Kind of conflict
Interface declaration