From 3470aa8996e182c988e90b3a75708ef57c865259 Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Fri, 25 Jan 2013 12:02:34 +0300
Subject: [PATCH] Resolved conflicts after merge.

---
 development.txt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/development.txt b/development.txt
index 3e68948da..bf33a76c2 100644
--- a/development.txt
+++ b/development.txt
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
-django-discover-runner>=0.2.2
-=======
 coverage
->>>>>>> tests_refactoring
+django-discover-runner>=0.2.2