From 69440aab960b720581fe5c0325096f0ff6e6f94b Mon Sep 17 00:00:00 2001
From: CarlosF03R <carlitoss.flores32@gmail.com>
Date: Wed, 11 Sep 2024 11:31:24 -0700
Subject: [PATCH] Resolve merge conflict

---
 main.cpp | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/main.cpp b/main.cpp
index 08dfcf5..fbeb63c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,17 +1,23 @@
 #include <iostream>
 
+using std::cout;
+using std::cin;
+using std::endl;
+
 int main(){
   double first, second;
 
-  std::cout<< "First number: ";
-  std::cin>> first;
-  std::cout<< "Second number: ";
-  std::cin>> second;
-
-  std::cout<< "Addition: "<< first << "+" << second << "=";
-  std::cout<< (first+second) << std::endl;
-  std::cout<< "Subtraction: "<< first << "-" << second << "=";
-  std::cout<< (first-second) << std::endl;
+  cout<< "First number: ";
+  cin>> first;
+  cout<< "Second number: ";
+  cin>> second;
 
+  cout<< "Addition: "<< first << "+" << second << "=";
+  cout<< (first+second) << endl;
+  cout<< "Subtraction: "<< first << "-" << second << "=";
+  cout<< (first-second) << endl;
+  cout<< "Multiplication: "<< first << "*" << second << "=";
+  cout<< (first*second) << endl;
+  
   return 0;
 }
\ No newline at end of file