main.cpp

@@ -5,8 +5,7 @@ using namespace std;
 int main()
 {
     cout << "Enter A and B: ";
-<<<<<<< HEAD
+    int a, b, mx, mn;
-    double a, b, mx, mn;
     cin >> a >> b;
     if (a>b){
         mx=a;
@@ -14,25 +13,13 @@ int main()
     }
     else{
         mx=b;
-=======
-    double a, b, mn;
-    cin >> a >> b;
-    if (a>b){
-        mn=b;
-    }
-    else{
->>>>>>> bfd3647 (code: min)
         mn=a;
     }
     cout << "A + B = " << a + b << '\n'
     << "A - B = " << a - b << '\n'
     << "A * B = " << a * b << '\n'
-<<<<<<< HEAD
     << "A * B = " << a * b << '\n'
     << "A / B = " << a / b << '\n'
     << "Max(A,B)= " << mx
-=======
-    << "A / B = " << a / b << '\n'
->>>>>>> bfd3647 (code: min)
     << "Min(A,B)= " << mn;
 }