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

---
 development.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/development.txt b/development.txt
index fad94d07b..3e68948da 100644
--- a/development.txt
+++ b/development.txt
@@ -1 +1,5 @@
-django-discover-runner>=0.2.2
\ No newline at end of file
+<<<<<<< HEAD
+django-discover-runner>=0.2.2
+=======
+coverage
+>>>>>>> tests_refactoring