From c69407345cb66822f249540ccbc01dfa17349e44 Mon Sep 17 00:00:00 2001
From: Dummy <a test account>
Date: Sat, 24 Dec 2022 05:51:03 +0100
Subject: [PATCH] shellcheck fix

---
 neofetch | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/neofetch b/neofetch
index 3cc84dd6..5974b93b 100755
--- a/neofetch
+++ b/neofetch
@@ -3292,15 +3292,9 @@ get_network() {
             if [[ $ActiveNetworkName == "Wi-Fi" ]]; then
                 LinkSpeed="$(/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -I | awk '/maxRate/{print}' | awk '{print $2}' )Mbps"
             else
-<<<<<<< HEAD
-                LinkSpeed="$(ifconfig \"$ActiveNetwork\" | awk '/media/{print}' | sed -E "s/.*\((.*)\).*/\1/")"
-            fi
-            network="\"$ActiveNetwork\": \"$ActiveNetworkName\"@\"$LinkSpeed\""
-=======
-                LinkSpeed="$(ifconfig $ActiveNetwork | awk '/media/{print}' | sed -E "s/.*\((.*)\).*/\1/")"
+                LinkSpeed="$(ifconfig "$ActiveNetwork" | awk '/media/{print}' | sed -E "s/.*\((.*)\).*/\1/")"
             fi
             network="$ActiveNetwork: $ActiveNetworkName@$LinkSpeed"
->>>>>>> parent of 3938f431 (shellcheck: double quote)
         ;;
     esac
     while IFS=' ' read -r n i; do