diff --git a/.gitignore b/.gitignore index 3882eb3..edc5aef 100644 --- a/.gitignore +++ b/.gitignore @@ -13,8 +13,9 @@ show_dir.o change_dir.o update_check.o man.o +calc.o <<<<<<< HEAD -math.o +math_ext.o ======= >>>>>>> f1cf6269f94065bfb8498dd7ef06bfbb61442b80 your-reality.o \ No newline at end of file