Fix merge conflict

dmlc · Nov 19, 2024 · 6641f7d · 6641f7d
1 parent 377b3e7
commit 6641f7d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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