Merge remote-tracking branch 'upstream/master'

dmlc · Nov 19, 2024 · 377b3e7 · 377b3e7
2 parents cb55d7a + 3568945
commit 377b3e7
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.github/runs-on.yml b/.github/runs-on.yml
@@ -34,3 +34,7 @@ runners:
     cpu: 32
     family: ["c7i-flex", "c7i", "c7a", "c5", "c5a"]
     image: windows-amd64
+<<<<<<< HEAD
+=======
+
+>>>>>>> upstream/master