Fixed error in calculator.h

src/main/c/taschenrechner.h

@@ -1,54 +1,3 @@
-<<<<<<< HEAD
-#ifndef TASCHENRECHNER_H
-#define TASCHENRECHNER_H
-
-doulbe add(doulbe a, doulbe b);
-
-doulbe minus(doulbe a, doulbe b);
-
-doulbe multiply(doulbe a, doulbe b);
-
-doulbe divide(doulbe a, doulbe b);
-
-// Square root function
-double squareRootFunction(double x);
-
-//..
-// Trigonometric functions
-double sineFunction(double angle);
-
-double cosineFunction(double angle);
-
-double tangentFunction(double angle);
-
-//..
-// Logarithmic functions
-double logarithmFunction(double x);
-
-double naturalLogarithmFunction(double x);
-
-double logarithmBase2Function(double x);
-
-//..
-// Exponential function
-double exponentialFunction(double x);
-
-// ..
-// Bitwise AND function
-int bitwiseAND(int num1, int num2);
-
-// Bitwise OR function
-int bitwiseOR(int num1, int num2);
-
-// Bitwise XOR function
-int bitwiseXOR(int num1, int num2);
-
-int mode(int userChoice);
-
-int displayMenu();
-
-#endif // TASCHENRECHNER_H
-=======
 #ifndef TASCHENRECHNER_H
 #define TASCHENRECHNER_H
 
@@ -107,5 +56,4 @@ int mode(int userChoice);
 
 int displayMenu();
 
-#endif // TASCHENRECHNER_H
->>>>>>> feature
+#endif // TASCHENRECHNER_H