resolve merge conflicts

sureshvazrala · Nov 30, 2020 · 8a738b0 · 8a738b0
1 parent de99092
commit 8a738b0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/machine_learning/ordinary_least_squares_regressor.cpp b/machine_learning/ordinary_least_squares_regressor.cpp
@@ -436,7 +436,7 @@ int main() {
     std::vector<float> Y(N);
 
     std::cout
-        << "Enter training data. Per sample, provide features and one output."
+        << "Enter training data. Per sample, provide features ad one output."
         << std::endl;
 
     for (size_t rows = 0; rows < N; rows++) {