Skip to content

Commit 55b4ff6

Browse files
committed
chore(git): Fix variable names + refactoring (moving the GitConflictResolver interface to the logic module) #12350
1 parent 0d2cc9a commit 55b4ff6

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package org.jabref.logic.git.conflicts;
2+
3+
import java.util.Optional;
4+
5+
import org.jabref.model.entry.BibEntry;
6+
7+
public interface GitConflictResolver {
8+
Optional<BibEntry> resolveConflict(ThreeWayEntryConflict conflict);
9+
}

0 commit comments

Comments
 (0)