Merge master and resolve conflicts

1 files changed, 2 insertions, 2 deletions

diff --git a/src/Persistence_representations/utilities/persistence_vectors/plot_persistence_vectors.cpp b/src/Persistence_representations/utilities/persistence_vectors/plot_persistence_vectors.cpp
index de08fcfe..2decb134 100644
--- a/src/Persistence_representations/utilities/persistence_vectors/plot_persistence_vectors.cpp
+++ b/src/Persistence_representations/utilities/persistence_vectors/plot_persistence_vectors.cpp
@@ -17,10 +17,10 @@ using Euclidean_distance = Gudhi::Euclidean_distance;
 using Vector_distances_in_diagram = Gudhi::Persistence_representations::Vector_distances_in_diagram<Euclidean_distance>;
 
 int main(int argc, char** argv) {
-  std::cout << "This program create a Gnuplot script to plot persistence vector. Please call this program with the "
+  std::clog << "This program create a Gnuplot script to plot persistence vector. Please call this program with the "
                "name of file with persistence vector. \n";
   if (argc != 2) {
-    std::cout << "Wrong number of parameters, the program will now terminate. \n";
+    std::clog << "Wrong number of parameters, the program will now terminate. \n";
     return 1;
   }
   Vector_distances_in_diagram l;