Remove merge message

reminisce · Jun 1, 2017 · 96e2dbd · 96e2dbd
1 parent 6471b73
commit 96e2dbd
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/python/mxnet/symbol.py b/python/mxnet/symbol.py
@@ -1789,13 +1789,6 @@ def load_json(json_str):
     return Symbol(handle)
 
 
-<<<<<<< HEAD
-=======
-# Initialize the atomic symbol in startups
-_init_symbol_module(Symbol, "mxnet")
-
-
->>>>>>> Initial checkin
 # pylint: disable=no-member
 # pylint: disable=redefined-builtin
 def pow(base, exp):