Дополнение к коммиту

fin_lab34.cpp

@@ -35,8 +35,19 @@ input_data(istream &thread, bool &prompt){
 }
 
 int
+<<<<<<< HEAD
+main(int argc, char* argv[]){
+    curl_global_init(CURL_GLOBAL_ALL);
+    if (argc > 1) {
+            cout << argc << endl;
+            for (int i = 0; i < argc; i++){
+                cout << argv[i] << endl;
+            }
+    }
+=======
 main(){
     curl_global_init(CURL_GLOBAL_ALL);
+>>>>>>> origin/main
     //CURLcode curl_global_init(CURL_GLOBAL_ALL);
     size_t font = 0;
     bool prompt = false;