Skip to content

Commit 0030fb9

Browse files
authored
Merge pull request #37 from cavusmustafa/fix_merge_conflicts
Fix merge conflicts
2 parents dc2c72e + 682ae80 commit 0030fb9

File tree

1,166 files changed

+40584
-17508
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,166 files changed

+40584
-17508
lines changed

shim/TARGETS renamed to .Package.swift/backend_coreml_debug/dummy.swift

File renamed without changes.

.Package.swift/backend_mps/dummy.swift

Whitespace-only changes.

.Package.swift/backend_mps_debug/dummy.swift

Whitespace-only changes.

.Package.swift/backend_xnnpack/dummy.swift

Whitespace-only changes.

.Package.swift/backend_xnnpack_debug/dummy.swift

Whitespace-only changes.

.Package.swift/executorch/dummy.swift

Whitespace-only changes.

.Package.swift/executorch_debug/dummy.swift

Whitespace-only changes.

.Package.swift/kernels_custom/dummy.swift

Whitespace-only changes.

.Package.swift/kernels_custom_debug/dummy.swift

Whitespace-only changes.

0 commit comments

Comments
 (0)