1 files changed, 9 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index e9cca26..31ee46d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,11 @@
+<<<<<<< HEAD
 main.o
 main_i386
+=======
+curl_test
+curl_test.o
+main.o
+main
+loop.o
+loop
+>>>>>>> 181d482 (Initial commit (i got too carried away with asm and forgot to commit))