Homec4science

fix bug due to unresolved conflict from last merge

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 15 2013, 15:20.

Description

fix bug due to unresolved conflict from last merge

Details

Committed
Axel Kohlmeyer <akohlmey@gmail.com>May 15 2013, 15:20
Pushed
jungeOct 6 2016, 16:49
Parents
rLAMMPS92b062658973: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Branches
Unknown
Tags
Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSe39428dafa0b: fix bug due to unresolved conflict from last merge (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 15 2013, 15:20