code: исходный код

text.cpp

@@ -79,5 +79,4 @@ void show_histogram(std::vector<size_t> bins) {
             std::cout << std::endl;
         }
     }
-
+}
-    }

unittest.depend

@@ -7,7 +7,11 @@
 	<vector>
 	<iostream>
 
+<<<<<<< HEAD
 1746447653 source:c:\users\professional\desktop\cs-lab34\lab1\unittest.cpp
+=======
+1746274690 source:c:\users\professional\desktop\cs-lab34\lab1\unittest.cpp
+>>>>>>> ccff7aed06ddfe57aff6a2785558e2c335f8cf61
 	"doctest.h"
 	"histogram_internal.h"
 
@@ -56,5 +60,9 @@
 	<sys/time.h>
 	<unistd.h>
 
+<<<<<<< HEAD
 1746447694 c:\users\professional\desktop\cs-lab34\lab1\histogram_internal.h
+=======
+1746444163 c:\users\professional\desktop\cs-lab34\lab1\histogram_internal.h
+>>>>>>> ccff7aed06ddfe57aff6a2785558e2c335f8cf61