merge

2020-01-25 15:30:55 +08:00
parent ec13ed4aaa 78f580ddaa
commit f0682731cd
1 changed files with 4 additions and 0 deletions
--- a/ml/logistic_regression/logistic_regression.md
+++ b/ml/logistic_regression/logistic_regression.md
@@ -110,7 +110,11 @@ $$

 $$
 cost(h_\theta(x), y) = 
+<<<<<<< HEAD
 	\left{
+=======
+	\left\\{
+>>>>>>> 78f580ddaa701274fd48a20e5ef6e7f7b497320a
 	\begin{aligned}
 	-log(h_\theta(x))&, y = 1\\\\
 	-log(1 - h_\theta(x))&, y = 0