Homec4science

fix merge conflict issue.

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 23 2014, 18:31.

Description

fix merge conflict issue.

Details

Committed
Axel Kohlmeyer <akohlmey@gmail.com>Jan 23 2014, 18:31
Pushed
jungeOct 6 2016, 16:49
Parents
rLAMMPS3d785bfd9ada: use proper MPI error flag for error reporting and fix compile issues
Branches
Unknown
Tags
Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSaf31ea627baf: fix merge conflict issue. (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 23 2014, 18:31