Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-19 22:12:10 +01:00
Code Issues Packages Projects Releases Activity

Fix access across jars

Browse Source
This commit is contained in:
Rene Pfeuffer
2019-11-11 16:15:45 +01:00
parent 3be74fbed6
commit cc7ef47153
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-core/src/main/java/sonia/scm/repository/spi/MergeConflictResult.java
View File

@@ -16,15 +16,15 @@ public class MergeConflictResult {
return Collections.unmodifiableList(conflicts);
}
void addBothModified(String path, String diff) {
public void addBothModified(String path, String diff) {
conflicts.add(new SingleMergeConflict(BOTH_MODIFIED, path, diff));
}
void addDeletedByThem(String path) {
public void addDeletedByThem(String path) {
conflicts.add(new SingleMergeConflict(DELETED_BY_THEM, path, null));
}
void addDeletedByUs(String path) {
public void addDeletedByUs(String path) {
conflicts.add(new SingleMergeConflict(DELETED_BY_US, path, null));
}