-
Andrey Alekseenko authored
Conflicts: - CITATION.cff - CMakeLists.txt - cmake/gmxVersionInfo.cmake - src/gromacs/mdrun/md.cpp - src/gromacs/mdrun/rerun.cpp Don't squash! Tagging @berkhess since the conflicts are between his changes.
Andrey Alekseenko authoredConflicts: - CITATION.cff - CMakeLists.txt - cmake/gmxVersionInfo.cmake - src/gromacs/mdrun/md.cpp - src/gromacs/mdrun/rerun.cpp Don't squash! Tagging @berkhess since the conflicts are between his changes.
Loading