From 052f553224e4f3b5232048cf3cd019e8f3e8c6ec Mon Sep 17 00:00:00 2001
From: virusdefender <virusdefender@users.noreply.github.com>
Date: Sun, 20 Mar 2016 15:14:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3git=20merge=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=9A=84requirements.txt=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 requirements.txt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 75d25c4..6f83e94 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,2 @@
-<<<<<<< HEAD
-lxml
-beautifulsoup
-=======
 beautifulsoup4
 lxml
->>>>>>> origin/master