From 930213b663a22563a7134d7d8631426aaf8bd1f6 Mon Sep 17 00:00:00 2001
From: "yihua.huang" <code4crafter@gmail.com>
Date: Thu, 13 Mar 2014 08:10:30 +0800
Subject: [PATCH] fix pom

---
 pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7b48f044..5405d5ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,16 +50,12 @@
     <modules>
         <module>webmagic-core</module>
         <module>webmagic-extension/</module>
-<<<<<<< HEAD
-        <module>webmagic-samples/</module>
-=======
         <module>webmagic-scripts/</module>
         <module>webmagic-avalon</module>
         <module>webmagic-lucene</module>
         <module>webmagic-samples</module>
         <module>webmagic-saxon</module>
         <module>webmagic-selenium</module>
->>>>>>> 757cc9b9427ee26d1aed9d5cbf365c0654ebb7b0
     </modules>
 
     <dependencyManagement>