Resolve conflict

apache · Mar 11, 2019 · d20024c · d20024c
1 parent c2e02e4
commit d20024c
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/python/tvm/relay/frontend/mxnet.py b/python/tvm/relay/frontend/mxnet.py
@@ -434,7 +434,6 @@ def _mx_l2_normalize(inputs, attrs):
     "exp",
     "negative",
     "reshape_like",
-    "slice_like",
     "zeros_like",
     "ones_like",
     "where",