Clean-up git markers.

pasqal-io · Jul 19, 2024 · 329e276 · 329e276
1 parent 984401e
commit 329e276
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/tests/test_main.py b/tests/test_main.py
@@ -1,14 +1,8 @@
 from __future__ import annotations
 
-<<<<<<< HEAD
 from qadence2.main import main
 
 expected_msg = "Welcome to qadence2!"
-=======
-from qadence2-core.main import main
-
-expected_msg = "Welcome to qadence2-core!"
->>>>>>> 7e25dbc (Initial commit.)
 
 
 def test_main() -> None: