Assembly calculator

2024-06-25 22:15:34 +00:00 · 2024-06-25 22:15:34 +00:00 · 5db2abebf0
parent 0b3bf42c46 c09a0191b7
commit 5db2abebf0
1 changed files with 4 additions and 0 deletions
--- a/04_prompt/prompt.s
+++ b/04_prompt/prompt.s
@ -15,7 +15,11 @@
 	greetings_size:  .byte .-greetings_msg
 	buffer_size: .byte .-buffer
 	
+<<<<<<< HEAD
 	.section .bss
+=======
+ 	.section .bss
+>>>>>>> c09a0191b7c1a96d5ebae339bd58253549ec70ac
 	buffer: .space 256
 	
 	.section .text