From 81b13772b9113120f067e960ce2da4c9eb0e193e Mon Sep 17 00:00:00 2001
From: Joseph Henry <joseph.henry@zerotier.com>
Date: Mon, 1 May 2023 14:21:45 -0700
Subject: [PATCH] Fix bad merge

---
 .github/workflows/validate-1m-linux.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/validate-1m-linux.sh b/.github/workflows/validate-1m-linux.sh
index 6ca8a9190..8ba500d93 100755
--- a/.github/workflows/validate-1m-linux.sh
+++ b/.github/workflows/validate-1m-linux.sh
@@ -119,10 +119,7 @@ time_zt_node2_start=`date +%s`
 
 for ((s=0; s<=MAX_WAIT_SECS; s++))
 do
-<<<<<<< HEAD
     echo "Checking for online status: $s"
-=======
->>>>>>> dev
     node1_online="$($ZT1 -j info | jq '.online' 2>/dev/null)"
     node2_online="$($ZT2 -j info | jq '.online' 2>/dev/null)"
     if [[ "$node1_online" == "true" ]]
@@ -144,11 +141,8 @@ done
 if [[ "$both_instances_online" != "true" ]]
 then
     echo "One or more instances of ZeroTier failed to come online. Aborting test." >&2
-<<<<<<< HEAD
     $ZT1 -j info
     $ZT2 -j info
-=======
->>>>>>> dev
     exit 1
 fi