Fixed merge conflict report.

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}