Update 0.2.6

2021-05-08 20:06:22 +02:00 · 2021-05-08 20:06:22 +02:00 · 88f11da06f
commit 88f11da06f
parent 8b6f6b88e0 3a0cb7078c
13 changed files with 177 additions and 88 deletions
--- a/main.c
+++ b/main.c
@ -15,10 +15,7 @@
 #include "utils/sql_test.h"
 #include "etc/logo.h"
 #include "etc/man.h"
-<<<<<<< HEAD
 #include "etc/math.h"
-=======
->>>>>>> f1cf6269f94065bfb8498dd7ef06bfbb61442b80
 #include "etc/your-reality.h"
 #include "utils/logger.h"
 #include "utils/sys_info.h"