Skip to content

Commit a7ecb6f

Browse files
committed
Fix merge conflict
1 parent 366c763 commit a7ecb6f

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

backends/cuda/cuda_backend.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,9 @@
1212
from typing import Any, Dict, final, List, Optional, Set
1313

1414
import torch
15-
<<<<<<< HEAD
1615
from executorch.backends.cuda.replace_slice_copy_with_slice import (
1716
ReplaceSliceCopyWithSlicePass,
1817
)
19-
=======
20-
from executorch.backends.cuda.replace_slice_copy_with_slice import ReplaceSliceCopyWithSlicePass
21-
>>>>>>> e5be1a2b85 (Make it work)
2218
from executorch.exir._serialize._named_data_store import NamedDataStore
2319
from executorch.exir._warnings import experimental
2420
from executorch.exir.backend.backend_details import (

0 commit comments

Comments
 (0)