From bd6e2f6beeee58e0aed240212607084210e8ca97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= <oli_r@fg4f.de>
Date: Sat, 3 Jan 2015 22:18:39 +0100
Subject: [PATCH] Fixed merge-error in src/pizza

---
 src/pizza | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pizza b/src/pizza
index e2b53d1..85a48b8 100755
--- a/src/pizza
+++ b/src/pizza
@@ -8,7 +8,6 @@ PIZZARCV=
 PIZZASEND=
 
 help() {
-<<<<<<< HEAD
 	echo "pizza - sent small ASCII-Icons by Mail"
 	echo "--------------------------------------"
 	echo "Usage:  -p         Send a pizza (default)"
@@ -71,4 +70,4 @@ if [ ! $PIZZARCV ]; then
 fi
 
 mail -s "${PIZZAUSER} sent you a ${PIZZAART} on ${PIZZAHOST}!" -S from=${PIZZASEND} ${PIZZARCV} < "${PIZZAINC}/${PIZZAART}"
-exit 0
+exit 0
\ No newline at end of file