Fix rebase issue

ComputationalCryoEM · Sep 22, 2022 · 9f6cbd0 · 9f6cbd0
1 parent f01d61e
commit 9f6cbd0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/tests/_basis_util.py b/tests/_basis_util.py
@@ -224,7 +224,7 @@ def testModulated(self):
 
             energy_ratio = energy_outside / energy_total
 
-            self.assertTrue(energy_ratio < 0.10)<<<<<<< HEAD
+            self.assertTrue(energy_ratio < 0.10)
     pass