Fix rebase issue

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