main.cpp

@@ -5,7 +5,7 @@ using namespace std;
 int main()
 {
     cout << "Enter A and B: ";
-    double a, b;
+    int a, b;
     cin >> a >> b;
     cout << "A + B = " << a + b << '\n'
         << "A - B = " << a - b << '\n'
@@ -17,14 +17,11 @@ int main()
         else {
             cout << "maximum: " << b;
         }
-<<<<<<< HEAD
         if ( a < b ) {
             cout << "minimum: " << a;
         }
         else {
             cout << "minimum: " << b;
         }
-=======
->>>>>>> double
         return 0;
 }