reuse existing function / modify alignment

apache · Dec 24, 2019 · 7649a6e · 7649a6e
1 parent 04198b3
commit 7649a6e
Show file tree

Hide file tree

Showing 3 changed files with 161 additions and 216 deletions.
diff --git a/python/mxnet/symbol/numpy/_symbol.py b/python/mxnet/symbol/numpy/_symbol.py
@@ -22,13 +22,9 @@
 import ctypes
 import numpy as _np
 from . import _op as _mx_np_op
-<<<<<<< 897f4fae075c5261958de1a07cded0b5b3058a7a
 from ...base import _LIB, SymbolHandle, numeric_types, mx_uint, integer_types, string_types
 from ...base import c_str
 from ...base import py_str
-=======
-from ...base import _LIB, SymbolHandle, numeric_types, mx_uint, integer_types
->>>>>>> add op insert
 from ...util import check_call, set_module, _sanity_check_params
 from ...util import wrap_np_unary_func, wrap_np_binary_func
 from ...context import current_context