Remove merge line
33af7ab24874
Actions

Authored by Stan Moore <stanmoore1@gmail.com> on Feb 13 2017, 18:59.

Description

Remove merge line

Committed

Stan Moore <stanmoore1@gmail.com>

Feb 13 2017, 18:59

Pushed

junge

Oct 19 2017, 09:53

Parents

rLAMMPS8f9b2aca06e7: Removing unused files in Kokkos lib

Branches

Unknown

Tags

Unknown

Stan Moore <stanmoore1@gmail.com> committed rLAMMPS33af7ab24874: Remove merge line (authored by Stan Moore <stanmoore1@gmail.com>).Feb 13 2017, 18:59

				Path
	M			lib/kokkos/Makefile.kokkos