bitshelf
diff --git a/‎大話/note/code/simpleFactory‎
8 Bytes b/‎大話/note/code/simpleFactory‎
8 Bytes
diff --git a/‎大話/note/code/simpleFactory.cpp‎
Lines changed: 0 additions & 9 deletions b/‎大話/note/code/simpleFactory.cpp‎
Lines changed: 0 additions & 9 deletions
@@ -1,10 +1,7 @@
-<<<<<<< HEAD
 #include <iostream>
 using namespace std;
 
 //基類
-=======
->>>>>>> 14d3b8f815a3a91095d901d67b7df12325c89591
 class COperation {
 public:
     int m_nFirst;
@@ -15,18 +12,14 @@ class COperation {
     }
 };
 
-<<<<<<< HEAD
 //加法
-=======
->>>>>>> 14d3b8f815a3a91095d901d67b7df12325c89591
 class AddOperation : public COperation {
 public:
     virtual double GetResult() {
         return m_nFirst + m_nSecond;
     }
 };
 
-<<<<<<< HEAD
 //減法
 class SubOperation : public COperation {
 public:
@@ -72,5 +65,3 @@ int main() {
     cout << op->GetResult() << endl;
     return 0;
 }
-=======
->>>>>>> 14d3b8f815a3a91095d901d67b7df12325c89591