From 8a738b07f3b7c1bda97bee8f6a6e64d35dc9fea2 Mon Sep 17 00:00:00 2001 From: Ayaan Khan Date: Wed, 1 Jul 2020 03:28:12 +0530 Subject: [PATCH] resolve merge conflicts --- machine_learning/ordinary_least_squares_regressor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machine_learning/ordinary_least_squares_regressor.cpp b/machine_learning/ordinary_least_squares_regressor.cpp index 0c865761b..a693fdd6c 100644 --- a/machine_learning/ordinary_least_squares_regressor.cpp +++ b/machine_learning/ordinary_least_squares_regressor.cpp @@ -436,7 +436,7 @@ int main() { std::vector 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++) {