diff --git a/src/pizza b/src/pizza index 56df2e9..e2b53d1 100755 --- a/src/pizza +++ b/src/pizza @@ -8,6 +8,7 @@ PIZZARCV= PIZZASEND= help() { +<<<<<<< HEAD echo "pizza - sent small ASCII-Icons by Mail" echo "--------------------------------------" echo "Usage: -p Send a pizza (default)"