From cc7ef4715379f31dd242edd3d76ea8e1e5f2bb1f Mon Sep 17 00:00:00 2001
From: Rene Pfeuffer <rene.pfeuffer@cloudogu.com>
Date: Mon, 11 Nov 2019 16:15:45 +0100
Subject: [PATCH] Fix access across jars

---
 .../java/sonia/scm/repository/spi/MergeConflictResult.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/MergeConflictResult.java b/scm-core/src/main/java/sonia/scm/repository/spi/MergeConflictResult.java
index 8bf48417e8..981a5c5446 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/MergeConflictResult.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/MergeConflictResult.java
@@ -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));
   }