Skip to content

Add multiplecation algorithm, fixes #1 #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KevinTran-01 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add multiplecation algorithm, fixes #1 #35

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f809560
Add multiplecation algorithm, fixes #1
KevinTran-01 Sep 11, 2024
514bd45
resolve merge conflict
KevinTran-01 Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,21 @@ int main(){
cout<< "Second number: ";
cin>> second;

<<<<<<< HEAD
std::cout<< "Addition: "<< first << "+" << second << "=";
std::cout<< (first+second) << std::endl;
std::cout<< "Subtraction: "<< first << "-" << second << "=";
std::cout<< (first-second) << std::endl;
std::cout<< "Multiplecation: "<< first << "*" << second << "=";
std::cout<< (first*second) << std::endl;
=======
cout<< "Addition: "<< first << "+" << second << "=";
cout<< (first+second) << endl;
cout<< "Subtraction: "<< first << "-" << second << "=";
cout<< (first-second) << endl;
cout<< "Multiplication: "<< first << "*" << second << "=";
cout<< (first*second) << endl;
>>>>>>> 14936c0a26d39b8368f0edd5a9f994a8c75474e4

return 0;
}