remove host vehicle data from sensor data again

Signed-off-by: Schloemicher, Thomas AVL,AT <thomas.schloemicher@avl.com>

Author: 0815-code

osi_sensordata.proto.orig

@@ -12,11 +12,7 @@ import "osi_detectedobject.proto";
 import "osi_detectedoccupant.proto";
 import "osi_sensorview.proto";
 import "osi_featuredata.proto";
-<<<<<<< HEAD
 import "osi_logicaldetectiondata.proto";
-=======
-import "osi_hostvehicledata.proto";
->>>>>>> fix semicolon
 
 package osi3;
 
@@ -302,6 +298,7 @@ message SensorData
     // object hypothesis and tracking.
     //
     optional FeatureData feature_data = 26;
+<<<<<<< HEAD
 
     // Logical detection data interface.
     //
@@ -317,4 +314,6 @@ message SensorData
     // in cartesian coordinates.
     //
     optional LogicalDetectionData logical_detection_data = 27;
+=======
+>>>>>>> remove host vehicle data from sensor data again
 }