3 Commits

Author	SHA1	Message	Date
Anne Gunn	9a5d8fd18b	Manually resolve two rebase conflicts.	2020-09-14 12:04:51 -06:00
Stan Moore	ba8d043c7e	Update Kokkos library in LAMMPS to v3.1	2020-04-16 09:06:08 -06:00
Stan Moore	60864e38d1	Update Kokkos library in LAMMPS to v3.0	2020-03-25 14:08:39 -06:00