chore: Resolve merge conflicts

Author: mediumTaj

src/IBM.Watson.Assistant.v2/IBM.Watson.Assistant.v2.csproj

@@ -1,33 +1,33 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <Description>IBM.Watson.Assistant.v2 wraps the Watson Assistant service (http://www.ibm.com/watson/developercloud/assistant.html)</Description>
-        <AssemblyTitle>IBM.Watson.Assistant.v2</AssemblyTitle>
-        <VersionPrefix>4.0.0-rc1</VersionPrefix>
-        <Authors>IBM Watson</Authors>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <AssemblyName>IBM.Watson.Assistant.v2</AssemblyName>
-        <PackageId>IBM.Watson.Assistant.v2</PackageId>
-        <PackageTags>watson;cognitive;speech;vision;machine-learning;ml;ai;artificial-intelligence;.NET;.NET-Standard</PackageTags>
-        <PackageIconUrl>https://watson-developer-cloud.github.io/dotnet-standard-sdk/img/Watson_Avatar_Pos_RGB.png</PackageIconUrl>
-        <PackageProjectUrl>https://github.com/watson-developer-cloud/dotnet-standard-sdk</PackageProjectUrl>
-        <Version>4.0.0-rc1</Version>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-        <DebugType>full</DebugType>
-        <DebugSymbols>true</DebugSymbols>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-        <DebugType>full</DebugType>
-        <DebugSymbols>true</DebugSymbols>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0-rc5" />
-        <PackageReference Include="IBM.Watson.Common" Version="3.0.1" />
-        <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
-    </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <Description>IBM.Watson.Assistant.v2 wraps the Watson Assistant service (http://www.ibm.com/watson/developercloud/assistant.html)</Description>
+        <AssemblyTitle>IBM.Watson.Assistant.v2</AssemblyTitle>
+        <VersionPrefix>4.0.0-rc1</VersionPrefix>
+        <Authors>IBM Watson</Authors>
+        <TargetFramework>netstandard2.0</TargetFramework>
+        <AssemblyName>IBM.Watson.Assistant.v2</AssemblyName>
+        <PackageId>IBM.Watson.Assistant.v2</PackageId>
+        <PackageTags>watson;cognitive;speech;vision;machine-learning;ml;ai;artificial-intelligence;.NET;.NET-Standard</PackageTags>
+        <PackageIconUrl>https://watson-developer-cloud.github.io/dotnet-standard-sdk/img/Watson_Avatar_Pos_RGB.png</PackageIconUrl>
+        <PackageProjectUrl>https://github.com/watson-developer-cloud/dotnet-standard-sdk</PackageProjectUrl>
+        <Version>4.0.0-rc1</Version>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+        <DebugType>full</DebugType>
+        <DebugSymbols>true</DebugSymbols>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+        <DebugType>full</DebugType>
+        <DebugSymbols>true</DebugSymbols>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.0.0-rc5" />
+        <PackageReference Include="IBM.Watson.Common" Version="3.0.1" />
+        <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    </ItemGroup>
+
+</Project>