# Conflicts: # ggml/src/ggml-cuda/conv-transpose-1d.cu # ggml/src/ggml-hip/CMakeLists.txt # scripts/ui-assets.cmake