From b9733363b360f3983d2465800ef154d4c5564ceb Mon Sep 17 00:00:00 2001
From: Kevin Finisterre <kf@digitalmunition.com>
Date: Wed, 11 Jun 2014 12:23:33 -0400
Subject: [PATCH] some revision control data is misplaced preventing compile

---
 .../src/plugins/config/images/fixedwing-shapes.svg           | 4 ----
 .../src/plugins/setupwizard/pages/fixedwingpage.cpp          | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/config/images/fixedwing-shapes.svg b/ground/openpilotgcs/src/plugins/config/images/fixedwing-shapes.svg
index f08814a7d..52d8f72b5 100644
--- a/ground/openpilotgcs/src/plugins/config/images/fixedwing-shapes.svg
+++ b/ground/openpilotgcs/src/plugins/config/images/fixedwing-shapes.svg
@@ -1100,11 +1100,7 @@
            id="path8516_1_"
            inkscape:connector-curvature="0"
            style="fill:none;stroke:#010101;stroke-width:0.69520003;stroke-linecap:round;stroke-linejoin:round" /></g></g></g><g
-<<<<<<< HEAD
      id="elevon"
-=======
-     id="v-tail"
->>>>>>> parent of 11fa414... Fix minor cosmetic issue where vtail model was not rendering in the Configuration screen. Edit the Inkscape Object Properties.
      transform="matrix(0.8,0,0,0.8,78.355285,170.6871)"><path
        style="stroke:#000000;stroke-width:0.75538152;stroke-miterlimit:10"
        inkscape:connector-curvature="0"
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.cpp
index 147b80d16..f2d8f27ab 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.cpp
@@ -105,13 +105,8 @@ void FixedWingPage::updateImageAndDescription()
     case SetupWizard::FIXED_WING_AILERON:
         elementId = "aileron";
         break;
-<<<<<<< HEAD
     case SetupWizard::FIXED_WING_ELEVON:
         elementId = "elevon";
-=======
-    case SetupWizard::FIXED_WING_VTAIL:
-        elementId = "v-tail";
->>>>>>> parent of 11fa414... Fix minor cosmetic issue where vtail model was not rendering in the Configuration screen. Edit the Inkscape Object Properties.
         break;
     default:
         elementId = "";