From b8fc399fac4e23ee8a7860d156ff89bd69ee751c Mon Sep 17 00:00:00 2001
From: Richard Harding <rharding@mitechie.com>
Date: Tue, 17 Apr 2012 09:20:23 -0400
Subject: [PATCH] Fix rebase issue in the Makefile

---
 Makefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Makefile b/Makefile
index 685111f..222f850 100644
--- a/Makefile
+++ b/Makefile
@@ -28,11 +28,7 @@ bin/python:
 
 .PHONY: clean_venv
 clean_venv:
-<<<<<<< HEAD
 	rm -rf bin include lib local man
-=======
-	rm -rf lib include local bin man
->>>>>>> 521eea5... ls
 
 develop: lib/python*/site-packages/bookie-api.egg-link
 lib/python*/site-packages/bookie-api.egg-link: