fix .gitignore

deepmodeling · Jun 21, 2021 · fc8b7f6 · fc8b7f6
1 parent 139c264
commit fc8b7f6
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,10 +27,5 @@ venv*
 _build
 _templates
 API_CC
-<<<<<<< HEAD
-dp/**
-build_lammps/**
-=======
 dp/
 build_lammps/
->>>>>>> devel