merged cherry-pick

strands-project · Nov 12, 2015 · bb99d39 · bb99d39
1 parent 578dfe4
commit bb99d39
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/metaroom_xml_parser/include/metaroom_xml_parser/load_utilities.h b/metaroom_xml_parser/include/metaroom_xml_parser/load_utilities.h
@@ -122,4 +122,3 @@ namespace semantic_map_registration_features
 }
 
 #endif
-
diff --git a/metaroom_xml_parser/include/metaroom_xml_parser/load_utilities.hpp b/metaroom_xml_parser/include/metaroom_xml_parser/load_utilities.hpp
@@ -308,7 +308,7 @@
 
         sort(matchingObservations.begin(), matchingObservations.end(),
              [](const std::string& a, const std::string& b )
-        {            
+        {
             std::string patrol_string = "patrol_run_";
             std::string room_string = "room_";
             std::string date_string = "YYYYMMDD";
@@ -516,4 +516,3 @@
 
         return toRet;
     }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -122,4 +122,3 @@ namespace semantic_map_registration_features
		}

		#endif