From 87549429c3b61861bf11fef97156452aaa907cc5 Mon Sep 17 00:00:00 2001
From: layman <layman@localhost>
Date: Mon, 28 Mar 2022 23:47:29 +0200
Subject: [PATCH] gentooup: cleanup failed merge

---
 gentooup.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/gentooup.sh b/gentooup.sh
index da14200..b6b6e97 100755
--- a/gentooup.sh
+++ b/gentooup.sh
@@ -138,17 +138,12 @@ if [[ $(qlist -I gentoo-sources) != "" ]] ; then
   myemerge "${PORTAGE_OPTIONS[@]}" --deselect gentoo-sources:"${CURRENTKERNELVERSION/"-gentoo"/}"
 fi
 
-<<<<<<< Updated upstream
-if [[ -n "$(which restart-services)" && $CHROOTED == "1" ]] ; then
-  restart-services -l
-=======
 if [[ -n "$(which updateEfiStubsAndBootManager.sh)" && $CHROOTED == "1" ]] ; then
   updateEfiStubsAndBootManager.sh
 fi
 
 if [[ -n "$(which restart_services)" && $CHROOTED == "1" ]] ; then
   restart_services -l
->>>>>>> Stashed changes
 fi
 echo "Started at $STARTDATE"
 echo "  Ended at $(date -Iseconds)"