Fix rebase issue in the Makefile

12 years ago · b8fc399fac
parent 82804b664d
commit b8fc399fac
1 changed files with 0 additions and 4 deletions
--- a/4
+++ b/4
@ -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: