Fix some merge conflicts

This commit is contained in:
Trevor Payne
2020-08-18 17:35:03 -05:00

View File

@@ -1,3 +1,3 @@
<packages>
<package id="PepperDashCore" version="1.0.41" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
<packages>
<package id="PepperDashCore" version="1.0.41" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
</packages>