fix submodule

ucb-bar · Jun 3, 2024 · 7b0475e · 7b0475e
1 parent 4b8d610
commit 7b0475e
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,10 +1,6 @@
 [submodule "software/gemmini-rocc-tests"]
 	path = software/gemmini-rocc-tests
-<<<<<<< HEAD
-	url = https://github.com/SeahK/gemmini-slam-tests 
-=======
 	url = https://github.com/SeahK/gemmini-slam-tests
->>>>>>> origin/spica
 [submodule "software/onnxruntime-riscv"]
 	path = software/onnxruntime-riscv
 	url = https://github.com/pranav-prakash/onnxruntime-riscv.git