Resolve merge conflicts

dimesoftware · Apr 28, 2020 · 729e171 · 729e171
1 parent 0d0d0d1
commit 729e171
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/src/Dime.AutoMapper.sln.DotSettings.user b/src/Dime.AutoMapper.sln.DotSettings.user
@@ -0,0 +1,4 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=907c634a_002D3d7c_002D45db_002D97fc_002D79f35886af95/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="All tests from &amp;lt;Tests&amp;gt;\&amp;lt;Dime.AutoMapper.Tests&amp;gt;" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
+  &lt;Project Location="D:\Source\Dime.Utilities\Dime.Automapper\src\test" Presentation="&amp;lt;Tests&amp;gt;\&amp;lt;Dime.AutoMapper.Tests&amp;gt;" /&gt;&#xD;
+&lt;/SessionState&gt;</s:String></wpf:ResourceDictionary>
diff --git a/src/test/AutoMapperFactoryTests.cs b/src/test/AutoMapperFactoryTests.cs
@@ -1,5 +1,4 @@
-using System;
-using AutoMapper;
+using AutoMapper;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Dime.AutoMapper.Tests
@@ -20,7 +19,7 @@ public AutoMapperFactoryTests()
         [TestMethod]
         [TestCategory("AutoMapper")]
         public void TestAutoMapperFactoryScanning()
-        {            
+        {
             IMapper mapper = AutoMapperFactory.Create();
             mapper.ConfigurationProvider.AssertConfigurationIsValid();
         }

diff --git a/src/test/Dime.AutoMapper.Tests.csproj b/src/test/Dime.AutoMapper.Tests.csproj
@@ -8,11 +8,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-<<<<<<< HEAD
     <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
-=======
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
->>>>>>> 40b8a8dcff34680c771f73ac6a3933a6678957ec
     <DebugType>portable</DebugType>
     <AssemblyName>Dime.AutoMapper.Tests</AssemblyName>
     <OutputType>Library</OutputType>

diff --git a/src/test/Mappers/Mapping.cs b/src/test/Mappers/Mapping.cs
@@ -1,5 +1,5 @@
-using AutoMapper;
-using System;
+using System;
+using AutoMapper;
 
 namespace Dime.AutoMapper.Tests.Models
 {

diff --git a/src/test/Mappers/TestClassMapper.cs b/src/test/Mappers/TestClassMapper.cs
@@ -1,6 +1,6 @@
-using AutoMapper;
+using System;
+using AutoMapper;
 using Dime.AutoMapper.Tests.Models;
-using System;
 
 namespace Dime.AutoMapper.Tests.Mappers
 {