From 0f2b7bd2bfbe7338d4f7253c194f29f2f228d6d0 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 22 Apr 2015 10:50:02 +0530
Subject: [PATCH] Update setup.py

---
 setup.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/setup.py b/setup.py
index 8011b759f1..8ac87b9c72 100644
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,6 @@
 from setuptools import setup, find_packages
 
-<<<<<<< HEAD
 version = "5.0.0-beta"
-=======
-version = "4.25.1"
->>>>>>> 3b8682f534f12bd72e52685d1286a2cc72713857
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()