Merge branch 'master' of https://github.com/netbenix/netbenixCMD

# Conflicts: # .gitignore # etc/man.c # etc/your-reality.c # etc/your-reality.h # main.c # makefile
2020-11-19 12:33:57 +01:00 · 2020-11-19 12:33:57 +01:00 · 8b6f6b88e0
commit 8b6f6b88e0
parent 7e5b44c61c f1cf6269f9
9 changed files with 176 additions and 65 deletions
--- a/.gitignore
+++ b/.gitignore
@ -13,5 +13,8 @@ show_dir.o
 change_dir.o
 update_check.o
 man.o
+<<<<<<< HEAD
 math.o
+=======
+>>>>>>> f1cf6269f94065bfb8498dd7ef06bfbb61442b80
 your-reality.o