Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 mldemos (0.4.3-1) unstable; urgency=low
 .
   * Initial Release.
Author: Barak A. Pearlmutter <bap@debian.org>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- mldemos-0.4.3.orig/MLDemos/mltrain.cpp
+++ mldemos-0.4.3/MLDemos/mltrain.cpp
@@ -144,13 +144,8 @@ bool MLDemos::Train(Classifier *classifi
                 FOR(i, testSamples.size())
                 {
                     if(testLabels[i] != it->first) continue;
-<<<<<<< HEAD
-                    trainSamples[i] = testSamples[i];
-                    trainLabels[i] = testLabels[i];
-=======
                     trainSamples.push_back(testSamples[i]);
                     trainLabels.push_back(testLabels[i]);
->>>>>>> devel
                     testSamples.erase(testSamples.begin() + i);
                     testLabels.erase(testLabels.begin() + i);
                     trainCnt++;
