浏览代码

Removing forgotten tag from previous merge conflict

Michael Robertson 12 年之前
父节点
当前提交
f340060bdf
共有 1 个文件被更改,包括 0 次插入1 次删除
  1. 0 1
      servicestack/src/SelfHost/packages.config

+ 0 - 1
servicestack/src/SelfHost/packages.config

@@ -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>