Homec4science

fix file broken by unresolved merge.

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 8 2010, 23:34.

Description

fix file broken by unresolved merge.

Details

Committed
Axel Kohlmeyer <akohlmey@gmail.com>Nov 8 2010, 23:34
Pushed
jungeOct 6 2016, 16:49
Parents
rLAMMPS423efabf0288: updated GPU package from gpulammps project repo.
Branches
Unknown
Tags
Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS3251f1382c3c: fix file broken by unresolved merge. (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Nov 8 2010, 23:34