We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 139c264 commit fc8b7f6Copy full SHA for fc8b7f6
1 file changed
.gitignore
@@ -27,10 +27,5 @@ venv*
27
_build
28
_templates
29
API_CC
30
-<<<<<<< HEAD
31
-dp/**
32
-build_lammps/**
33
-=======
34
dp/
35
build_lammps/
36
->>>>>>> devel
0 commit comments