resolve merge conflicts

VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs

@@ -11,6 +11,7 @@ using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCommon.Resources;
 using TUGraz.VectoCommon.Utils;
 using TUGraz.VectoCore.InputData.FileIO.XML.Common;
+using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider;
 using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Interfaces;
 using TUGraz.VectoCore.Utils;
 
@@ -255,7 +256,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 			: base(componentNode, sourceFile)
 		{
 			_vehicle = vehicle;
-			SourceType = DataSourceType.XMLEmbedded;
+			//SourceType = DataSourceType.XMLEmbedded;
 			ValidateGearCount();
 		}
 
@@ -350,7 +351,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 				}
 			}
 
-			if (DragCurves.Count > 1 && AnyMissingGear(currentGears))
+			if (DragCurves.Count > 1 && AnyMissingGear(currentGears)) {
 				throw new ArgumentException("The DragCurve contains a gear which was not specified under gears");
 			}
 		}

VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAngleDriveType.cs

@@ -17,7 +17,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
 		public XElement GetElement(IDeclarationInputDataProvider inputData)
 		{
 			var angelDrive = inputData.JobInputData.Vehicle.Components.AngledriveInputData;
-			if (angelDrive == null || angelDrive.Type != AngledriveType.SeparateAngledrive)
+			if (angelDrive == null || angelDrive.Type != AngledriveType.SeparateAngledrive) {
 				return null;
 			}