@@ -5,5 +5,4 @@
<package id="ServiceStack.OrmLite.SqlServer" version="3.9.59" targetFramework="net45" />
<package id="ServiceStack.Redis" version="3.9.59" targetFramework="net45" />
<package id="ServiceStack.Text" version="3.9.59" targetFramework="net45" />
-<<<<<<< HEAD
</packages>