commit after merge

Author: nielshulstaert

packages.config

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+<<<<<<< HEAD
   <package id="AWS.Logger.Core" version="2.0.1" targetFramework="net472" />
   <package id="AWSSDK.CloudWatchLogs" version="3.5.0.24" targetFramework="net472" />
   <package id="AWSSDK.Core" version="3.5.3.2" targetFramework="net472" />
@@ -24,6 +25,22 @@
   <package id="System.Security.AccessControl" version="5.0.0" targetFramework="net472" />
   <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net472" />
   <package id="System.Text.Encoding.CodePages" version="5.0.0" targetFramework="net472" />
+=======
+  <package id="AWS.Logger.Core" version="1.4.0" targetFramework="net472" />
+  <package id="AWSSDK.CloudWatchLogs" version="3.3.101.14" targetFramework="net472" />
+  <package id="AWSSDK.Core" version="3.3.103.30" targetFramework="net472" />
+  <package id="AWSSDK.S3" version="3.3.104.18" targetFramework="net472" />
+  <package id="log4net" version="2.0.10" targetFramework="net471" />
+  <package id="MathNet.Numerics" version="4.8.1" targetFramework="net472" />
+  <package id="Mono.Options" version="5.3.0.1" targetFramework="net471" />
+  <package id="Namotion.Reflection" version="1.0.8" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net472" />
+  <package id="NJsonSchema" version="10.1.5" targetFramework="net472" />
+  <package id="NUnit" version="3.12.0" targetFramework="net472" />
+  <package id="Parquet.Net" version="2.0.0" targetFramework="net471" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net472" />
+  <package id="System.Text.Encoding.CodePages" version="4.5.1" targetFramework="net472" />
+>>>>>>> 3d302d32dd87d4c7cc1288226b705f19da415274
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
   <package id="ThermoFisher.CommonCore.Data" version="5.0.0.71" targetFramework="net472" />
   <package id="ThermoFisher.CommonCore.RawFileReader" version="5.0.0.71" targetFramework="net472" />