Forgot merge in Mc Python class

Author: davidcorteso

fidimag/atomistic/monte_carlo.py

@@ -31,9 +31,9 @@ def __init__(self, mesh, name='unnamed'):
         self.create_tablewriter()
         self.vtk = SaveVTK(self.mesh, name=name)
 
-        self.hexagnoal_mesh = False
+        self.hexagonal_mesh = False
         if mesh.mesh_type == 'hexagonal':
-            self.hexagnoal_mesh =  True
+            self.hexagonal_mesh =  True
             #FIX ME !!!!
             self.nngbs = np.copy(mesh.neighbours)
         else:
@@ -151,15 +151,10 @@ def run(self, steps=1000, save_m_steps=100, save_vtk_steps=100, save_data_steps=
 
         for step in range(1, steps + 1):
             self.step = step
-<<<<<<< HEAD
             self.mc.run_step(self.spin, self.random_spin,
                              self.ngbs, self.nngbs, self.mesh.n_ngbs,
                              self.J, self.J1, self.D, self.D1, self._H, self.Kc,
-                             self.n, self.T, self.hexagnoal_mesh)
-=======
-            self.mc.run_step(self.spin, self.random_spin, self.ngbs, self.nngbs,
-                self.J, self.J1, self.D, self.D1, self._H, self.Kc, self.n, self.T, self.hexagnoal_mesh)
->>>>>>> e1183b59529611c79b3d43d7ca5e048707037c2a
+                             self.n, self.T, self.hexagonal_mesh)
             if save_data_steps is not None:
                 if step % save_data_steps == 0:
                     self.saver.save()
@@ -176,4 +171,4 @@ def run(self, steps=1000, save_m_steps=100, save_vtk_steps=100, save_data_steps=
 
 
 if __name__ == '__main__':
-	pass
+    pass