Remove skmonaco

Neuroinflab · Nov 23, 2018 · aaada25 · aaada25
1 parent 4dc2190
commit aaada25
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/kcsd/sKCSD.py b/kcsd/sKCSD.py
@@ -623,13 +623,8 @@ def parameters(self, **kwargs):
         self.dist_table_density = kwargs.pop('dist_table_density', 20)
         self.dim = 'skCSD'
         self.tolerance = kwargs.pop('tolerance', 2e-06)
-<<<<<<< HEAD
         self.exact = kwargs.pop('exact', False)
-=======
-        self.skmonaco_available = kwargs.pop('skmonaco_available',skmonaco_available)
-        self.est_xyz = np.array([])
         self.est_xyz_auto =  False
->>>>>>> kCSD fit
         if kwargs:
             raise TypeError('Invalid keyword arguments:', kwargs.keys())