From 2623c16b56b81e3a822e856de35b1974f5930838 Mon Sep 17 00:00:00 2001
From: Yuichi Motoyama <y-motoyama@issp.u-tokyo.ac.jp>
Date: Wed, 6 Nov 2024 16:12:19 +0900
Subject: [PATCH] fix conflict

---
 pyproject.toml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 00c3d8c..71504b8 100644
--- 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"]