Homec4science

and another conflict issue fixed

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Dec 9 2011, 15:43.

Description

and another conflict issue fixed

Details

Committed
Axel Kohlmeyer <akohlmey@gmail.com>Dec 9 2011, 15:43
Pushed
jungeOct 6 2016, 16:49
Parents
rLAMMPS084454855537: resolve one more merge conflict
Branches
Unknown
Tags
Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS333d86f4dda6: and another conflict issue fixed (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Dec 9 2011, 15:43