Update prompt.s
This commit is contained in:
parent
5db2abebf0
commit
83a64f4e72
|
|
@ -15,11 +15,10 @@
|
||||||
greetings_size: .byte .-greetings_msg
|
greetings_size: .byte .-greetings_msg
|
||||||
buffer_size: .byte .-buffer
|
buffer_size: .byte .-buffer
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
.section .bss
|
.section .bss
|
||||||
=======
|
|
||||||
.section .bss
|
.section .bss
|
||||||
>>>>>>> c09a0191b7c1a96d5ebae339bd58253549ec70ac
|
|
||||||
buffer: .space 256
|
buffer: .space 256
|
||||||
|
|
||||||
.section .text
|
.section .text
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue