Remove missed merge leftover

2022-07-20 11:22:48 +02:00 · 2022-07-20 11:22:48 +02:00 · 075e69e9e8
commit 075e69e9e8
parent 1fad8c59e1
1 changed files with 0 additions and 1 deletions
--- a/arch-setup/install.sh
+++ b/arch-setup/install.sh
@ -565,7 +565,6 @@ else
    echo "Skipping Element"
 fi
 '
->>>>>>> master

 #performance and battery life
 if [ $in_acpufreq -eq 1 ]; then