Remove line from merge

rpep · rpep · commit 5bc83f469d19 · 2018-05-02T16:10:07.000+01:00
diff --git a/fidimag/micro/lib/micro_clib.pyx b/fidimag/micro/lib/micro_clib.pyx
@@ -1,10 +1,8 @@
-<<<<<<< HEAD
 import numpy as np
 cimport numpy as np
 np.import_array()
-=======
-import numpy
->>>>>>> origin/master
+
+
 
 cdef extern from "micro_clib.h":
     void compute_exch_field_micro(double *m, double *field,
