1 files changed, 19 insertions, 0 deletions
diff --git a/main.asm b/main.asm
index f0b6221..1b3f997 100644
--- a/main.asm
+++ b/main.asm
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 global _start
 
 section .text
@@ -10,3 +11,21 @@ label:
 	cmp ecx, 0    ; compare ecx with 0 
 	jg label      ; jump if greater than label
 
+=======
+global main
+
+extern printf
+
+section .data
+	msg db "Hello, x86_64 Assembly!", 10, 0
+
+section .text
+
+main:
+	sub rsp, 8
+	lea rdi, [rel msg]
+	call printf wrt ..plt
+	mov eax, 0
+	add rsp, 8
+	ret
+>>>>>>> 181d482 (Initial commit (i got too carried away with asm and forgot to commit))