From ec5debb5829380dd0bcf52074ca36c0763d8d95f Mon Sep 17 00:00:00 2001
From: pimlie <pimlie@hotmail.com>
Date: Sat, 19 Apr 2025 16:17:26 +0200
Subject: [PATCH] chore: fix git stash issue

---
 plugins/wireguard/wireguard_ | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/plugins/wireguard/wireguard_ b/plugins/wireguard/wireguard_
index abccdf5b..46930769 100755
--- a/plugins/wireguard/wireguard_
+++ b/plugins/wireguard/wireguard_
@@ -99,20 +99,6 @@ function wg_peers {
     local -n _wg_peers=$1
     local iface=$2
 
-<<<<<<< Updated upstream
-    # From wg 8 manpage:
-    # If dump is specified, then several lines are printed; the first contains
-    # in order separated by tab: private-key, public-key, listen-port, fwmark.
-    # Subsequent lines are printed for each peer and contain in order separated
-    # by tab: public-key, preshared-key, endpoint, allowed-ips, latest-handshake,
-    # transfer-rx, transfer-tx, persistent-keepalive
-    for line in $(wg show "$iface" dump | grep -v none | tr '\t' ';'); do
-        column_count=$(awk -F';' '{print NF}' <<< "$line")
-        if [ "$column_count" -ne 8 ]; then
-            # First line of dump contains interface info, ignore this line
-            continue
-        fi
-=======
     if [ -z "${_CACHE_PEERS[$iface]}" ]; then
         # From wg 8 manpage:
         # If dump is specified, then several lines are printed; the first contains
@@ -123,7 +109,6 @@ function wg_peers {
         # Pipe to tail to skip first line
         _CACHE_PEERS["$iface"]="$(wg show "$iface" dump | tail -n +2)"
     fi
->>>>>>> Stashed changes
 
     readarray -t peers <<< "${_CACHE_PEERS[$iface]}"
     _wg_peers=("${peers[@]}")