removed tab and resolved merge conflict

Author: jdsika

osi_modelinternal.proto

@@ -40,7 +40,7 @@ message ModelInternalObject
     //
     enum ObjectType
     {
-	    // The object type is unknown. Value must not be used in ground truth.
+        // The object type is unknown. Value must not be used in ground truth.
         //
         OBJECT_TYPE_UNKNOWN = 0;
 
@@ -67,8 +67,8 @@ message ModelInternalObject
         // Object of type \c TrafficLight.
         //
         OBJECT_TYPE_TRAFFIC_LIGHT = 6;
-		
-		// Object is a ghost object and does not exist in ground truth.
+
+        // Object is a ghost object and does not exist in ground truth.
         //
         OBJECT_TYPE_GHOST = 7;
     }

osi_object.proto

@@ -261,7 +261,7 @@ message MovingObject
     // Definition of object types.
     //
     enum Type
-	{
+    {
         // Type of the object is unknown (must not be used in ground truth).
         //
         TYPE_UNKNOWN = 0;

osi_sensordata.proto

@@ -169,7 +169,7 @@ message SensorData
     //
     optional DetectedEntityHeader lane_header = 16;
 
-    // The list of lane detected by the sensor
+    // The list of lanes detected by the sensor
     //
     // \note OSI uses singular instead of plural for repeated field names.
     //

osi_sensorview.proto

@@ -29,7 +29,7 @@ package osi;
 // treatment of the sensors.
 //
 // Alternatively combined sensor models can also consume one combined
-// \c SensorView, with either combined or seperate \c SensorData outputs,
+// \c SensorView, with either combined or separate \c SensorData outputs,
 // depending on model architecture.
 //
 message SensorView
@@ -141,7 +141,7 @@ message SensorView
 //
 // Radar specific sensor view data.
 //
-message RadarSensorView 
+message RadarSensorView
 {
     // Radar Input Configuration valid at the time the data was created.
     //
@@ -158,8 +158,8 @@ message RadarSensorView
 
     //
     // \brief Definition of the radar reflection.
-    //    
-    message Reflection 
+    //
+    message Reflection
     {
         // Relative signal level of the reflection.
         //
@@ -171,7 +171,7 @@ message RadarSensorView
         // Unit: [dB]
         //
         optional double signal_strength = 1;
-        
+
         // Time of flight.
         //
         // This is the time of flight of the reflection, which is directly
@@ -180,15 +180,15 @@ message RadarSensorView
         // Unit: [s]
         //
         optional double time_of_flight = 2;
-        
+
         // Doppler shift.
         //
         // Shift in frequency based on the specified TX frequency.
         //
         // Unit: [Hz]
         //
         optional double doppler_shift = 3;
-        
+
         // TX horizontal angle (azimuth).
         //
         // Horizontal angle of incidence of the source of the reflection
@@ -197,7 +197,7 @@ message RadarSensorView
         // Unit: [rad]
         //
         optional double source_horizontal_angle = 4;
-        
+
         // TX vertical angle (elevation).
         //
         // Vertical angle of incidence of the source of the reflection
@@ -214,12 +214,12 @@ message RadarSensorView
 //
 // Lidar specific sensor view data.
 //
-message LidarSensorView 
+message LidarSensorView
 {
     // Lidar View Configuration valid at the time the data was created.
     //
     optional LidarSensorViewConfiguration view_configuration = 1;
-    
+
     // Ray Tracing Data.
     //
     // This field includes one entry for each ray, in left-to-right,
@@ -244,7 +244,7 @@ message LidarSensorView
         // Unit: [dB]
         //
         optional double signal_strength = 1;
-            
+
         // Time of flight.
         //
         // This is the time of flight of the reflection, which is directly
@@ -253,7 +253,7 @@ message LidarSensorView
         // Unit: [s]
         //
         optional double time_of_flight = 2;
-            
+
         // Doppler shift.
         //
         // Shift in frequency based on the specified TX frequency.
@@ -269,12 +269,12 @@ message LidarSensorView
 //
 // Camera specific sensor view data.
 //
-message CameraSensorView 
-{   
+message CameraSensorView
+{
     // Camera View Configuration valid at the time the data was created.
     //
     optional CameraSensorViewConfiguration view_configuration = 1;
-    
+
     // Raw Image Data.
     //
     // The raw image data in the memory layout and order specified by the
@@ -287,7 +287,7 @@ message CameraSensorView
 // \brief Definition of the ultrasonic sensor view.
 //
 // Ultrasonic specific sensor view data.
-message UltrasonicSensorView 
+message UltrasonicSensorView
 {
     // Ultrasonic Input Configuration valid at the time the data was created.
     //