Merge branch 'junhzhan/develop' of...

Merge branch 'junhzhan/develop' of https://github.com/ROCmSoftwarePlatform/composable_kernel into HEAD

Merge branch 'junhzhan/develop' of...
Merge branch 'junhzhan/develop' of https://github.com/ROCmSoftwarePlatform/composable_kernel into HEAD
6352dfd8 · Junhao · 99c249cb · 12ac9ebf · 6352dfd8
Commit 6352dfd8 authored May 31, 2023 by Junhao
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

.gitignore .gitignore +7 -0

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,13 @@ build*
 # GDB temporary files
 .gdb_history
 install.dir*
+<<<<<<< HEAD
 library/src/utility/convolution_parameter.cu
 library/src/utility/host_tensor.cu
 library/src/utility/device_memory.cu
+=======
+
+library/src/utility/convolution_parameter.cu
+library/src/utility/host_tensor.cu
+library/src/utility/device_memory.cu
+>>>>>>> 12ac9ebf5f8723dcb9815070c1d86223cfbb0ce9