Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

/**
* @author Valentin Zickner
* @author Yanming Zhou
*/
public enum MergeMode {

Expand All @@ -23,7 +24,7 @@ public enum MergeMode {
AS_OLD("as-old"),
BY_DATE("by-date");

protected String name;
private final String name;

MergeMode(String name) {
this.name = name;
Expand Down