Skip to content

Commit

Permalink
change the default id
Browse files Browse the repository at this point in the history
  • Loading branch information
chenson42 committed Mar 24, 2012
1 parent 0a649b9 commit 2712ca4
Showing 1 changed file with 1 addition and 1 deletion.
Expand Up @@ -18,7 +18,7 @@ public enum ResolveConflict {
NEWER_WINS, MANUAL, IGNORE, FALLBACK
};

private String conflictId = "default";
private String conflictId;
private String targetChannelId;
private String targetCatalogName;
private String targetSchemaName;
Expand Down

0 comments on commit 2712ca4

Please sign in to comment.