clean up unresolved conflict from last merge.
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Nov 24 2010, 23:54 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS138fbced0859: add makefiles for kraken
- Branches
- Unknown
- Tags