diff --git a/src/main/java/org/jabref/gui/collab/EntryAddChangeViewModel.java b/src/main/java/org/jabref/gui/collab/EntryAddChangeViewModel.java index 4cb0acf6c51..45832985b5b 100644 --- a/src/main/java/org/jabref/gui/collab/EntryAddChangeViewModel.java +++ b/src/main/java/org/jabref/gui/collab/EntryAddChangeViewModel.java @@ -11,7 +11,7 @@ import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.entry.BibEntry; -class EntryAddChangeViewModel extends DatabaseChangeViewModel { +class EntryAddChangeViewModel extends DatabaseChangeViewModel { private final BibEntry diskEntry; diff --git a/src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java b/src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java index 2cdc1953335..56ce1f1a0ea 100644 --- a/src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java +++ b/src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java @@ -34,7 +34,7 @@ public EntryChangeViewModel(BibEntry entry, BibEntry newEntry, BibDatabaseContex .map(key -> Localization.lang("Modified entry") + ": '" + key + '\'') .orElse(Localization.lang("Modified entry")); - mergePanel = new MergeEntries(firstEntry, secondEntry, database.getMode()); + mergePanel = new MergeEntries(firstEntry, null, database.getMode()); } @Override diff --git a/src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java b/src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java index 5637fde0a2d..6f36948a785 100644 --- a/src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java +++ b/src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java @@ -14,7 +14,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -class EntryDeleteChangeViewModel extends DatabaseChangeViewModel { +class EntryDeleteChangeViewModel extends DatabaseChangeViewModel { private static final Logger LOGGER = LoggerFactory.getLogger(EntryDeleteChangeViewModel.class); private final BibEntry entry;