fix makefile and fix accidental git thing in main.asmHEADmain

2 files changed, 1 insertions, 16 deletions

diff --git a/Makefile b/Makefile
index 0b1c9ea..6090d37 100644
--- a/Makefile
+++ b/Makefile
@@ -21,4 +21,4 @@ curl_test: curl_test.o
 	gcc curl_test.o -lcurl -o curl_test
 
 clean:
-	rm curl_test.o curl_test main.o main loop.o loop
+	rm -f curl_test.o curl_test main.o main loop.o loop
diff --git a/main.asm b/main.asm
index 1b3f997..104bf71 100644
--- a/main.asm
+++ b/main.asm
@@ -1,17 +1,3 @@
-<<<<<<< HEAD
-global _start
-
-section .text
-_start:
-	mov ebx, 1  ; start at 1
-	mov ecx, 4  ; num iterations
-label:
-	add ebx, ebx  ; ebx += ebx 
-	dec ecx       ; ecx -= 1
-	cmp ecx, 0    ; compare ecx with 0 
-	jg label      ; jump if greater than label
-
-=======
 global main
 
 extern printf
@@ -28,4 +14,3 @@ main:
 	mov eax, 0
 	add rsp, 8
 	ret
->>>>>>> 181d482 (Initial commit (i got too carried away with asm and forgot to commit))