Removed accidentally left merge conflict resolution decorators

FAIRmat-NFDI · Jul 5, 2024 · 53fe633 · 53fe633
1 parent f19a2a8
commit 53fe633
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/tests/nomad/test_parsing.py b/tests/nomad/test_parsing.py
@@ -1,8 +1,5 @@
 """This is a code that performs several tests on nexus tool"""
-<<<<<<< HEAD
-=======
 
->>>>>>> master
 #
 # Copyright The NOMAD Authors.
 #