Merge branch 'master' of https://github.com/KeppySoftware/KMC

Author: bri

KeppyMIDIConverter/packages.config

@@ -9,11 +9,19 @@
   <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net45" />
   <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net45" requireReinstallation="true" />
   <package id="System.Globalization" version="4.3.0" targetFramework="net45" />
+<<<<<<< HEAD
   <package id="System.IO" version="4.3.0" targetFramework="net45" requireReinstallation="true" />
   <package id="System.IO.Compression" version="4.3.0" targetFramework="net45" requireReinstallation="true" />
   <package id="System.Linq" version="4.3.0" targetFramework="net45" requireReinstallation="true" />
   <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net45" requireReinstallation="true" />
   <package id="System.Net.Http" version="4.3.0" targetFramework="net45" requireReinstallation="true" />
+=======
+  <package id="System.IO" version="4.3.0" targetFramework="net45" />
+  <package id="System.IO.Compression" version="4.3.0" targetFramework="net45" />
+  <package id="System.Linq" version="4.3.0" targetFramework="net45" />
+  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net45" />
+  <package id="System.Net.Http" version="4.3.4" targetFramework="net45" />
+>>>>>>> fc9a0a7c150694244b0edd1b94c460c3127af096
   <package id="System.Net.Primitives" version="4.3.0" targetFramework="net45" />
   <package id="System.ObjectModel" version="4.3.0" targetFramework="net45" />
   <package id="System.Reflection" version="4.3.0" targetFramework="net45" requireReinstallation="true" />
@@ -27,7 +35,11 @@
   <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net45" />
   <package id="System.Text.Encoding" version="4.3.0" targetFramework="net45" />
   <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net45" />
+<<<<<<< HEAD
   <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net45" requireReinstallation="true" />
+=======
+  <package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net45" />
+>>>>>>> fc9a0a7c150694244b0edd1b94c460c3127af096
   <package id="System.Threading" version="4.3.0" targetFramework="net45" />
   <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net45" />
   <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net45" requireReinstallation="true" />