ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix overlooked merge conflict

Browse Source
This commit is contained in:
Axel Kohlmeyer
2018-06-18 18:09:59 -04:00
parent dade67664d
commit 605b4dca22
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/src/pair_meam_spline.txt
View File

@ -164,9 +164,5 @@ for more info.
Kress, Modelling Simulation Materials Science Engineering, 8, 825
(2000).
<<<<<<< HEAD
:link(Zhang4)
=======
:link(Zhang2)
>>>>>>> Documentation V1
[(Zhang)] Zhang and Trinkle, Computational Materials Science, 124, 204-210 (2016).