Skip to content

Commit

Permalink
Merge branch 'kokkos' of github.com:khuck/xpress-apex into kokkos
Browse files Browse the repository at this point in the history 
Conflicts:
	src/apex/apex_kokkos.cpp
  • Loading branch information
@khuck
khuck committed Aug 11, 2020
2 parents 6890b8e + bfc461e commit 46ebb54
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 46ebb54

Please sign in to comment.