Update

etc/man.c

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -47,52 +46,4 @@ void showManEntry(char *arg[]){
     } else {
         printf("Entry not found.\n");
     }
-=======
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-// Color Codes:
-// Reset:       \033[0m
-// Red:         \033[0;31m
-// Green:       \033[0;32m
-// Yellow:      \033[0;33m
-// Blue:        \033[0;34m
-// Magenta:     \033[0;35m
-// Cyan:        \033[0;36m
-// BoldRed:     \033[1;31m
-// BoldGreen:   \033[1;32m
-// BoldYellow:  \033[1;33m
-// BoldBlue:    \033[1;34m
-// BoldMagenta: \033[1;35m
-// BoldCyan:    \033[1;36m
-
-//Main function to start man is at the bottom
-
-//MAN ENTRIES
-//LS
-void manEntry_ls(){
-    printf("\033[0;33m##################\033[0m\n");
-    printf("\033[0;33m# Manual of \033[0;36m'ls' \033[0;33m#\033[0m\n");
-    printf("\033[0;33m##################\033[0m\n\n");
-    printf("\033[0;33mNAME\033[0m\n");
-    printf("\t\033[0;36mls - list directory contents\033[0m\n\n");
-    printf("\033[0;33mUSAGE\033[0m\n");
-    printf("\t\033[0;36mls \033[0;35m[DIRECTORY]\033[0m\n\n");
-    printf("\033[0;33mDESCRIPTION\033[0m\n");
-    printf("\t\033[0;36mList files and directorys in the given directory. Sorts entries alphabetically.\033[0m\n\n");
-}
-
-
-
-//MAIN FUNCTION
-void showManEntry(char *arg[]){
-    if(!strcmp(arg[1], "man")){
-        printf("Coming soon.\n");
-    } else if(!strcmp(arg[1], "ls")){
-        manEntry_ls();
-    } else {
-        printf("Entry not found.\n");
-    }
->>>>>>> f1cf6269f94065bfb8498dd7ef06bfbb61442b80
 }

etc/math.c

@@ -1,24 +1,24 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include "../utils/logger.h"
-
-#include "math.h"
-
-double Add(double x, double y){
-    return(x + y);
-}
-
-double Sub(double x, double y){
-    return(x - y);
-}
-
-double Mul(double x, double y){
-    return(x * y);
-}
-double Div(double x, double y){
-    if (y == 0.0)
-        return 0.0;
-    else 
-        return(x / y);
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "../utils/logger.h"
+
+#include "math.h"
+
+double Add(double x, double y){
+    return(x + y);
+}
+
+double Sub(double x, double y){
+    return(x - y);
+}
+
+double Mul(double x, double y){
+    return(x * y);
+}
+double Div(double x, double y){
+    if (y == 0.0)
+        return 0.0;
+    else 
+        return(x / y);
 }

etc/math.h

@@ -1,9 +1,9 @@
-#ifndef _MATH_H_
-#define _MATH_H_
-
-double Add(double x, double y);
-double Sub(double x, double y);
-double Mul(double x, double y);
-double Div(double x, double y);
-
+#ifndef _MATH_H_
+#define _MATH_H_
+
+double Add(double x, double y);
+double Sub(double x, double y);
+double Mul(double x, double y);
+double Div(double x, double y);
+
 #endif