Merge branch 'master' of github.com:RosstheRoss/TestingFun

1 files changed, 0 insertions, 24 deletions

diff --git a/ee1301/wk1/lab1/strap012_lab1_c_1.cpp b/ee1301/wk1/lab1/strap012_lab1_c_1.cpp
deleted file mode 100644
index 362110f..0000000
--- a/ee1301/wk1/lab1/strap012_lab1_c_1.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <iostream>

-#include <string>

-using namespace std;

-

-int main()

-{

-    string name1;

-    string name2;

-    int h1, h2;

-    

-    cout << "Enter your name: ";

-    getline (cin,name1);

-    cout << "Enter your height: ";

-    cin >> h1;

-    cout << "Enter your comrade's name: ";

-    cin.ignore();

-    getline (cin,name2);

-    cout << "Enter your comrade's height: ";

-    cin >> h2;

-    

-    cout << name1 << " and " << name2 << " standing on top of each other are " << h1+h2 << " feet tall!" << endl;

-  

-  

-}