From 2e17a6f8b374dd04cf9f5644627990a96e15c1ea Mon Sep 17 00:00:00 2001
From: steppke_a <alexander.steppke@psi.ch>
Date: Fri, 21 Apr 2023 15:57:43 +0000
Subject: [PATCH] Update tests/test_utils.py

---
 tests/test_utils.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/tests/test_utils.py b/tests/test_utils.py
index d168bbc..68fc955 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -33,15 +33,8 @@ def test_find_nearest():
     a = np.linspace(0,99,100)
     assert find_nearest(a,10.1) == 10
 
-<<<<<<< HEAD
-# TODO: repair with newer xraydb 4.5.0 when available in conda-forge
-# def test_xray_transmission():
-#    T = xray_transmission(9000, 100e-6, material = 'Si')
-#    assert T == 0.342385039732607
-
-=======
 def test_xray_transmission():
     T = xray_transmission(9000, 100e-6, material = 'Si')
     assert T == 0.342385039732607
->>>>>>> fd8f63b (fixed for lmfit 1.2)
+