From 6641f7d1c555387c226943f160433a66f0422ea0 Mon Sep 17 00:00:00 2001
From: Hyunsu Cho <chohyu01@cs.washington.edu>
Date: Tue, 19 Nov 2024 09:45:31 -0800
Subject: [PATCH] Fix merge conflict

---
 .github/runs-on.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/runs-on.yml b/.github/runs-on.yml
index 1911c527481d..e21895ee8c3b 100644
--- a/.github/runs-on.yml
+++ b/.github/runs-on.yml
@@ -34,7 +34,3 @@ runners:
     cpu: 32
     family: ["c7i-flex", "c7i", "c7a", "c5", "c5a"]
     image: windows-amd64
-<<<<<<< HEAD
-=======
-
->>>>>>> upstream/master