From b888063f117004a20bd0def7cc43c990fbaabd05 Mon Sep 17 00:00:00 2001
From: Brandon Taylor <alsoicode@gmail.com>
Date: Mon, 14 Mar 2016 11:12:01 -0400
Subject: [PATCH] Fixed bad merge.

---
 adminsortable/__init__.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/adminsortable/__init__.py b/adminsortable/__init__.py
index 884d67f..d1c07af 100644
--- a/adminsortable/__init__.py
+++ b/adminsortable/__init__.py
@@ -1,9 +1,5 @@
-<<<<<<< Updated upstream
-VERSION = (2, 0, 12)
-=======
 VERSION = (2, 0, 14)
->>>>>>> Stashed changes
-DEV_N = None
+DEV_N = None
 
 
 def get_version():