main.cpp

@@ -5,11 +5,7 @@ using namespace std;
 int main()
 {
     cout << "Enter A and B: ";
-<<<<<<< HEAD
     int a, b, maximum, minimum;
-=======
-    double a, b, maximum;
->>>>>>> double
     cin >> a >> b;
 
     if (a > b) {