From 0924efee0159d8cf1fbf1c3282c9500dd36978f3 Mon Sep 17 00:00:00 2001 From: Lauren Date: Wed, 10 Sep 2025 16:16:15 -0700 Subject: [PATCH 1/2] x04: Resolve merge conflict in main.cpp (Closes #62) --- main.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/main.cpp b/main.cpp index a495fc9..0846541 100644 --- a/main.cpp +++ b/main.cpp @@ -1,21 +1,21 @@ #include +using namespace std; #include int main() { - std::cout << "THE FIRST EXAMPLE MATH DISPLAY!\n"; - std::cout << "Hi, please enter two whole numbers: "; + cout << "THE FIRST EXAMPLE MATH DISPLAY!\n"; + cout << "Hi, please enter two whole numbers: "; int x,y; - std::cin >> x >> y; - std::cout << "Addition: " << x + y << std::endl; - std::cout << "Subtraction: " << x - y << std::endl; - std::cout << "Multiplication: " << x * y << std::endl; - std::cout << "Division: " << x / y << std::endl; - std::cout << "Remainder: " << x % y << std::endl; - std::cout << "Square Root: " << sqrt(x) << std::endl; - std::cout << "Square: " << pow(x, y) << std::endl; - + cin >> x >> y; + cout << "Addition: " << x << "+" << y << "=" << x + y << endl; + cout << "Subtraction: "<< x << "-" << y << "=" << x - y << endl; + cout << "Multiplication: " << x << "*" << y << "=" << x * y << endl; + cout << "Division: " << x << "/" << y << "=" << x / y << endl; + cout << "Remainder: " << x << "%" << y << "=" << x % y << endl; + cout << "Square Root: " << "√" << x << "=" << sqrt(x) << endl; + cout << "Square: " << x << "^" << y << "=" << pow(x, y) << endl; return 0; } From a140e6a3232c88e32a33cb5343cbbb89c2958f91 Mon Sep 17 00:00:00 2001 From: laurunion <166334905+laurunion@users.noreply.github.com> Date: Wed, 17 Sep 2025 11:52:55 -0700 Subject: [PATCH 2/2] Create README.md added status badge --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..6b4548a --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +[![Build C++](https://github.com/laurunion/MyFirstExample/actions/workflows/build.yml/badge.svg)](https://github.com/laurunion/MyFirstExample/actions/workflows/build.yml)