Hotfix: Remove obsolete language keys

Author: koppor

jablib/src/main/resources/l10n/JabRef_en.properties

@@ -3375,8 +3375,6 @@ Merged\ and\ updated.=Merged and updated.
 Nothing\ to\ push.\ Local\ branch\ is\ up\ to\ date.=Nothing to push. Local branch is up to date.
 Please\ open\ a\ library\ before\ pushing.=Please open a library before pushing.
 Pushed\ successfully.=Pushed successfully.
-Merge\ completed\ with\ conflicts.=Merge completed with conflicts.
-Successfully\ merged\ and\ updated.=Successfully merged and updated.
 Commit\ message\ cannot\ be\ empty=Commit message cannot be empty
 Committed\ successfully=Committed successfully
 Enter\ commit\ message\ here=Enter commit message here