From bf89851b23d338a99e25d8ef43d7dc06ec54d81d Mon Sep 17 00:00:00 2001
From: Mariano Lizarraga <malife@gmail.com>
Date: Mon, 21 Feb 2011 10:57:54 -0600
Subject: [PATCH] Fixed some missing curly braces that were removed by the
 conflict resolution tool

---
 src/uas/UAS.h          | 2 +-
 src/ui/WaypointList.cc | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/uas/UAS.h b/src/uas/UAS.h
index 96bbc44d7..11d80e3a9 100644
--- a/src/uas/UAS.h
+++ b/src/uas/UAS.h
@@ -357,7 +357,7 @@ protected slots:
     void receiveMessageNamedValue(const mavlink_message_t& message);
 
 private:
-    unsigned int mode;          ///< The current mode of the MAV
+//    unsigned int mode;          ///< The current mode of the MAV
 };
 
 
diff --git a/src/ui/WaypointList.cc b/src/ui/WaypointList.cc
index 0c067d529..e04b51c8f 100644
--- a/src/ui/WaypointList.cc
+++ b/src/ui/WaypointList.cc
@@ -191,11 +191,12 @@ void WaypointList::add()
             wp = new Waypoint(0, uas->getLatitude(), uas->getLongitude(), uas->getAltitude(), 0.0, 0.0, 0.0, 0.0, true, true, MAV_FRAME_GLOBAL, MAV_CMD_NAV_WAYPOINT);
             uas->getWaypointManager()->addWaypoint(wp);
 
+        }
     }
 }
 
-void WaypointList::addCurrentPositonWaypoint()
-{
+void WaypointList::addCurrentPositonWaypoint(){
+
     /* TODO: implement with new waypoint structure
     if (uas)
     {
-- 
2.22.0