Homec4science

avoid merge conflict

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 6 2017, 20:41.

Description

avoid merge conflict

Details

Committed
Axel Kohlmeyer <akohlmey@gmail.com>Oct 6 2017, 20:41
Pushed
jungeOct 19 2017, 09:53
Parents
rLAMMPS58e1969de241: rename misleading "CPU time" into "Time spent"
Branches
Unknown
Tags
Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS6820db99e22f: avoid merge conflict (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 6 2017, 20:41