From d7b587260afd58ac498573c4e64c697b62ea5daa Mon Sep 17 00:00:00 2001
From: "Paul Buetow (mars.fritz.box)" <paul@buetow.org>
Date: Sun, 29 Dec 2013 15:18:26 +0100
Subject: There is no hunting like the hunting of man, and those who have
 hunted armed men long enough and liked it, never care for anything else
 thereafter. 		-- Ernest Hemingway

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

diff --git a/Makefile b/Makefile
index eb8fba6..e89e992 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,6 @@ deinstall:
 	test ! -z "$(DESTDIR)" && test -d $(DESTDIR)/usr/share/$(NAME) && rm -r $(DESTDIR)/usr/share/$(NAME) || exit 0
 	test ! -z "$(DESTDIR)" && test -f $(DESTDIR)/etc/default/photoalbum && rm $(DESTDIR)/etc/default/photoalbum || exit 0
 clean:
-<<<<<<< HEAD
 	test -d ./bin && rm -Rf ./bin || exit 0
 	test -d ./debian/photoalbum && rm -Rf ./debian/photoalbum || exit 0
 version:
@@ -43,6 +42,3 @@ clean-top:
 	rm ../$(NAME)_*.changes
 	rm ../$(NAME)_*.deb
 
-=======
-	sh -c 'rm -Rf dist *.tar; exit 0'
->>>>>>> 14250af451c56b00f9e94d7b27dc24465d954a81
-- 
cgit v1.2.3