Fixed merge conflict report.

ea023780 · Jayke Meijer · c5b4ef7c · ea023780
Commit ea023780 authored Dec 20, 2011 by Jayke Meijer
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

docs/report.tex docs/report.tex +0 -4

No files found.
--- a/docs/report.tex
+++ b/docs/report.tex
@@ -172,11 +172,7 @@ order. Starting with dividing the pattern in to cells of size 16.
 result is a feature vector of the image.

 \item Feed these vectors to a support vector machine. This will ''learn'' which
-<<<<<<< HEAD
 vector indicates what vector is which character. 
-=======
-vectors indicate what letter. 
->>>>>>> 2e1b2e8c8db4f802d203791a6f03eeca7d0aff70

 \end{itemize}