2022-09-09 修复了STL_N题的乱码

cairbin/【ACM-作业2】STL入门/STL_N_STL-Set.cpp

@@ -13,16 +13,6 @@ using namespace std;
 int main()
 {
     int t;
-<<<<<<< HEAD
-    while (cin >> t)
-    {
-        set<int> s;
-        for (int i = 0; i < t; i++)
-        {
-            int query, n;
-            cin >> query;
-            if (query == 1)
-=======
     while(cin >> t)
     {
         set<int> s;
@@ -31,12 +21,10 @@ int main()
             int query,n;
             cin >> query;
             if(query == 1)
->>>>>>> 12b2baa6e83ca12fb38e5bd3e19ef391e253721e
             {
                 cin >> n;
                 s.insert(n);
             }
-<<<<<<< HEAD
             else if (query == 2)
             {
                 cin >> n;
@@ -51,21 +39,7 @@ int main()
                 else
                     cout << "No" << endl;
             }
-=======
-            else if(query == 2)
-            {
-                cin >> n;
-                if(s.find(n)!=s.end())
-                    s.erase(s.find(n));
-            }
-            else{
-                cin >> n;
-                if(s.find(n)!=s.end())
-                    cout << "Yes" << endl;
-                else
-                    cout << "No" << endl;
-            }
->>>>>>> 12b2baa6e83ca12fb38e5bd3e19ef391e253721e
+            
         }
     }