Commit 605b4dca authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

fix overlooked merge conflict

parent dade6766

doc/src/pair_meam_spline.txt

+0 −4
Original line number Diff line number Diff line
@@ -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).

CRA Git | Maintained and supported by SUSTech CRA and CCSE