fix conflict resolution mistakes

ros · Jul 13, 2017 · bff1b74 · bff1b74
1 parent 2962689
commit bff1b74
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/bondcpp/src/bond.cpp b/bondcpp/src/bond.cpp
@@ -232,9 +232,8 @@ bool Bond::waitUntilBroken(ros::WallDuration timeout)
   boost::mutex::scoped_lock lock(mutex_);
   ros::SteadyTime deadline(ros::SteadyTime::now() + timeout);
 
-  while (sm_.getState().getId() != SM::Dead.getId())
-  {
-    if (!ros::ok())
+  while (sm_.getState().getId() != SM::Dead.getId()) {
+    if (!ros::ok()) {
       break;
     }