Skip to content

Commit

Permalink
Merge pull request espressomd#2337 from KaiSzuttor/non_bonded_test
Browse files Browse the repository at this point in the history
Features: LJGEN_SOFTCORE implies LENNARD_JONES_GENERIC.
  • Loading branch information
KaiSzuttor authored and RudolfWeeber committed Oct 26, 2018
1 parent bce14a1 commit 7a25484
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/features.def
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ LJ_WARN_WHEN_CLOSE
LENNARD_JONES_GENERIC implies LENNARD_JONES
LJCOS
LJCOS2
LJGEN_SOFTCORE
LJGEN_SOFTCORE implies LENNARD_JONES_GENERIC
COS2
GAY_BERNE
SMOOTH_STEP
Expand Down

0 comments on commit 7a25484

Please sign in to comment.