Fix merge conflict

editor-tools · Nov 15, 2017 · 34358bf · 34358bf
1 parent d7c647a
commit 34358bf
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/packages.config b/src/packages.config
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-<<<<<<< HEAD
   <package id="Fody" version="1.29.4" targetFramework="net45" developmentDependency="true" />
   <package id="NullGuard.Fody" version="1.4.6" targetFramework="net45" developmentDependency="true" />
-=======
-  <package id="Fody" version="1.29.3" targetFramework="net45" developmentDependency="true" />
-  <package id="NullGuard.Fody" version="1.4.4" targetFramework="net45" developmentDependency="true" />
->>>>>>> origin/httplistener
 </packages>