up

metascroy · metascroy · commit c99830313105 · 2025-07-22T12:47:04.000-07:00
diff --git a/.github/workflows/_unittest.yml b/.github/workflows/_unittest.yml
@@ -43,7 +43,7 @@ jobs:
   macos:
     uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
     with:
-      runner: macos-m1-stable
+      runner: macos-15
       python-version: '3.11'
       submodules: 'recursive'
       ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
diff --git a/backends/apple/coreml/test/test_torch_ops.py b/backends/apple/coreml/test/test_torch_ops.py
@@ -2,7 +2,10 @@
 #
 # Please refer to the license found in the LICENSE file in the root directory of the source tree.
 
+<<<<<<< HEAD
 import platform
+=======
+>>>>>>> 921dafe9b (up)
 import sys
 import unittest
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,10 @@`
`2`	`2`	`#`
`3`	`3`	`# Please refer to the license found in the LICENSE file in the root directory of the source tree.`
`4`	`4`
	`5`	`+<<<<<<< HEAD`
`5`	`6`	`import platform`
	`7`	`+=======`
	`8`	`+>>>>>>> 921dafe9b (up)`
`6`	`9`	`import sys`
`7`	`10`	`import unittest`
`8`	`11`