Merge branch 'main' of https://github.com/viniciusfdasilva/riscv64_asm

2024-06-26 14:59:50 +00:00 · 2024-06-26 14:59:50 +00:00 · d307b61fb3
parent 62cbc969c7 83a64f4e72
commit d307b61fb3
1 changed files with 3 additions and 4 deletions
--- a/04_prompt/prompt.s
+++ b/04_prompt/prompt.s
@ -14,12 +14,11 @@
 	greetings_msg:   .asciz "Hi "
 	greetings_size:  .byte .-greetings_msg
 	buffer_size: .byte .-buffer
-	
-<<<<<<< HEAD
+
 	.section .bss
-=======
+
 	.section .bss
->>>>>>> c09a0191b7c1a96d5ebae339bd58253549ec70ac
+
 	buffer: .space 256
 	
 	.section .text