From aa1842cc42e87ba59d310389fe3a96cc855a3f42 Mon Sep 17 00:00:00 2001
From: Scott Klum <scott.klum@gmail.com>
Date: Fri, 22 Feb 2013 15:44:08 -0500
Subject: [PATCH] Stupidity reversed

---
 sdk/plugins/stasm.cpp | 7 -------
 1 file changed, 0 insertions(+), 7 deletions(-)

diff --git a/sdk/plugins/stasm.cpp b/sdk/plugins/stasm.cpp
index afc88d4..ba95482 100644
--- a/sdk/plugins/stasm.cpp
+++ b/sdk/plugins/stasm.cpp
@@ -1,14 +1,9 @@
 #include <QProcess>
-<<<<<<< HEAD
 #include <stasm_dll.hpp>
 #include <opencv2/highgui/highgui.hpp>
-=======
-
-#include <stasm/stasm_dll.hpp>
 
 #include <opencv2/highgui/highgui.hpp>
 
->>>>>>> 9cfbe4a6bc2e683ed8be044b5007ddcfcfcfcd23
 #include <openbr_plugin.h>
 
 using namespace cv;
@@ -66,8 +61,6 @@ class StasmTransform : public UntrainableTransform
                      src.file.name.toStdString().c_str(), reinterpret_cast<char*>(src.m().data), src.m().cols, src.m().rows,
                      src.m(), (src.m().channels() == 3), qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/mu-68-1d.conf"),  qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/mu-76-2d.conf"));
 
-
-
         if (nlandmarks == 0) qFatal("Unable to detect Stasm landmarks");
 
         for (int i = 0; i < nlandmarks; i++)
--
libgit2 0.21.4