forgot to merge packages.config files

chester89 · chester89 · commit 61e5ac7088d5 · 2013-04-21T20:16:23.000+04:00
diff --git a/src/Examples.FirstAutomappedProject/packages.config b/src/Examples.FirstAutomappedProject/packages.config
@@ -1,9 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" />
-<<<<<<< HEAD
-  <package id="NHibernate" version="3.0.0.4000" targetFramework="net35" />
-=======
-  <package id="NHibernate" version="3.3.3.4000" targetFramework="net35" />
->>>>>>> examplesToNuget
+  <package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" />
+  <package id="NHibernate" version="3.3.1.4000" targetFramework="net35" />
 </packages>
diff --git a/src/Examples.FirstProject/packages.config b/src/Examples.FirstProject/packages.config
@@ -1,9 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" />
-<<<<<<< HEAD
-  <package id="NHibernate" version="3.0.0.4000" targetFramework="net35" />
-=======
-  <package id="NHibernate" version="3.3.3.4000" targetFramework="net35" />
->>>>>>> examplesToNuget
+  <package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net35" />
+  <package id="NHibernate" version="3.3.1.4000" targetFramework="net35" />
 </packages>
