From dbcdffbfdf3fecba2ca197c0769e9be2e547e5fc Mon Sep 17 00:00:00 2001
From: MacRimi <ricoextincion@gmail.com>
Date: Tue, 25 Feb 2025 00:13:46 +0100
Subject: [PATCH] update

---
 install_proxmenux.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/install_proxmenux.sh b/install_proxmenux.sh
index cad0e1d..c2ceb64 100644
--- a/install_proxmenux.sh
+++ b/install_proxmenux.sh
@@ -46,14 +46,8 @@ LOCAL_VERSION_FILE="$BASE_DIR/version.txt"
 MENU_SCRIPT="menu"
 VENV_PATH="/opt/googletrans-env"
 
-<<<<<<< HEAD
 # Source utils.sh for common functions and styles
 if ! source <(curl -sSf "$UTILS_URL"); then
-=======
- Source utils.sh for common functions and styles
-#if ! source <(curl -sSf "$UTILS_URL"); then
-if ! source <(curl -sSf "https://raw.githubusercontent.com/MacRimi/ProxMenux/main/scripts/utils.sh"); then
->>>>>>> 0e982bca3b178e704bbe2353073a20a1e4dfa1d9
     echo "Error: Could not load utils.sh from $UTILS_URL"
     exit 1
 fi