fix conflict

issp-center-dev · Nov 6, 2024 · 2623c16 · 2623c16
1 parent 7007069
commit 2623c16
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -20,11 +20,7 @@ scipy = "^1"
 mpi4py = "^3"
 pymatgen = ">=2019.12.3 <2023.5.8"
 qe_tools = "^1.1"
-<<<<<<< HEAD
-=======
 nequip = {version=">=0.5.6", optional=true}
-"ruamel.yaml" = { version = "<0.18.0", python = "<3.8" }
->>>>>>> develop
 
 [tool.poetry.extras]
 nequip = ["nequip"]