Fix rebase issue

janden · janden · commit 17c29ca00472 · 2022-09-22T15:26:44.000+02:00
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:
