слияние веток

.gitignore

@@ -1,3 +1,5 @@
 /bin
 /obj/
-/project.layout
+/project.layout
+/main.exe
+/main.o

main.cpp

@@ -5,7 +5,7 @@ using namespace std;
 int main()
 {
     cout << "Enter A and B: ";
-    int a, b;
+    double a, b;
     cin >> a >> b;
     cout << "A + B = " << a + b << '\n'
          << "A - B = " << a - b << '\n'