Skip to content

Commit

Permalink
Merge pull request plumed#559 from PlumedBot/master-210a8276f
Browse files Browse the repository at this point in the history
Plumedbot pull request

cc: @h2nch2co2h
  • Loading branch information
GiovanniBussi authored Mar 11, 2020
2 parents 210a827 + a102e2c commit 84cf2e0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/funnel/FPS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This file is part of funnel code module.
The FM code respects the CC BY-NC license.
The FM code respects the CC BY-NC license.
Users are free to download, adapt and use the code as long as it is not for commercial purposes.
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */
#include "colvar/Colvar.h"
Expand Down
2 changes: 1 addition & 1 deletion src/funnel/Funnel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This file is part of funnel code module.
The FM code respects the CC BY-NC license.
The FM code respects the CC BY-NC license.
Users are free to download, adapt and use the code as long as it is not for commercial purposes.
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */
#include "bias/Bias.h"
Expand Down

0 comments on commit 84cf2e0

Please sign in to comment.