avoid merge conflict

This commit is contained in:
Axel Kohlmeyer
2018-12-11 23:03:01 -05:00
parent 04b365818e
commit ba98cff5a8

View File

@ -485,7 +485,7 @@ README for more info on Pizza.py and how to use these scripts.
reax tool :h4,link(reax_tool)
The reax sub-directory contains stand-alond codes that can
The reax sub-directory contains stand-alone codes that can
post-process the output of the "fix reax/c/bonds"_fix_reaxc_bonds.html
command from a LAMMPS simulation using "ReaxFF"_pair_reaxc.html. See
the README.txt file for more info.