Fix merge error

Change-Id: I31050c7ac0f7d88064e7b166c41cfaa47e982b65
apache · Nov 9, 2021 · b92a2a2 · b92a2a2
1 parent b7c74ac
commit b92a2a2
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/python/tvm/relay/backend/contrib/ethosu/te/__init__.py b/python/tvm/relay/backend/contrib/ethosu/te/__init__.py
@@ -18,8 +18,5 @@
 
 from .convolution import *
 from .depthwise import *
-<<<<<<< HEAD
 from .pooling import *
-=======
 from .inline import *
->>>>>>> 2d7aa323a... [ETHOSU][2b] Create CascaderGraphs from TE graphs