From aaba3d24f3888d191db70199dcf841889fec294d Mon Sep 17 00:00:00 2001 From: Ilia Rostovtsev Date: Mon, 27 Jan 2020 14:20:57 +0300 Subject: [PATCH] Fix plain text file --- package-updates/lang/en | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package-updates/lang/en b/package-updates/lang/en index 5ac4b1fc3..a6813fdc1 100644 --- a/package-updates/lang/en +++ b/package-updates/lang/en @@ -148,11 +148,5 @@ repos_enone=None selected repos_title=Delete Repositories repos_rusure=Are you sure you want to delete the $1 selected package repositories? Packages installed from them will still be available, but may not be updatable. repos_ok=Delete Now -<<<<<<< HEAD -index_install_disallowed_backports=By default backports repositories have a lower priority than stable (100), thus they won't be installed or upgraded unless explicitly configured to (or the package only exists in backports) - packages from backports must be installed using command line, with special flags -index_new_backports=Backports new version $1 -index_caninstall_backports=Available for manual installation -======= ->>>>>>> parent of 8cc0aaad0... Fix to handle backports repos (Ubuntu enabled default) __norefs=1