summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorArslaan Pathan <[email protected]>2026-09-30 12:37:06 +1300
committerArslaan Pathan <[email protected]>2026-09-30 12:39:55 +1300
commit7e9043d484c30d018a012f835dda5eae9fa17860 (patch)
treed44842c091e6cfa48d16062cfc96bf31bdb2d760 /.gitignore
parent2bb4f7e34806054fa15174b2586241c2b82e040c (diff)
downloadx86-asm-7e9043d484c30d018a012f835dda5eae9fa17860.tar.xz
x86-asm-7e9043d484c30d018a012f835dda5eae9fa17860.zip
idk whats even in this commit
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore9
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))