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

correct merge conflict

Browse Source
This commit is contained in:
Jacob Gissinger
2021-11-05 01:11:08 -04:00
parent eab6bc5bf7
commit 049895b3e4
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/read_data.cpp
View File

@ -60,7 +60,9 @@ static std::unordered_set<std::string> section_keywords = {
"Dihedral Coeffs", "Improper Coeffs",
"BondBond Coeffs", "BondAngle Coeffs", "MiddleBondTorsion Coeffs",
"EndBondTorsion Coeffs", "AngleTorsion Coeffs",
"AngleAngleTorsion Coeffs", "BondBond13 Coeffs", "AngleAngle Coeffs"
"AngleAngleTorsion Coeffs", "BondBond13 Coeffs", "AngleAngle Coeffs",
"Atom Type Labels", "Bond Type Labels", "Angle Type Labels",
"Dihedral Type Labels", "Improper Type Labels"
};
// function to check whether a string is a known data section name