Added pull conflicts

nomad-coe · Mar 11, 2024 · 9c8991b · 9c8991b
2 parents 0929957 + b410cba
commit 9c8991b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/tests/test_atoms_state.py b/tests/test_atoms_state.py
@@ -22,7 +22,6 @@
 from nomad.units import ureg
 
 from . import logger
-
 from nomad_simulations.atoms_state import (
     OrbitalsState,
     CoreHole,

diff --git a/tests/test_model_system.py b/tests/test_model_system.py
@@ -22,7 +22,6 @@
 from nomad.units import ureg
 
 from . import logger
-
 from nomad_simulations.model_system import (
     AtomicCell,
     Symmetry,