pheerai/pizza
0
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Fixed merge-error in src/pizza

Browse source
This commit is contained in:
Oliver Rümpelein 2015-01-03 22:18:39 +01:00
parent 1ed970bf31
commit bd6e2f6bee
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/pizza
View file

@ -8,7 +8,6 @@ PIZZARCV=
PIZZASEND= PIZZASEND=
help() { help() {
<<<<<<< HEAD
echo "pizza - sent small ASCII-Icons by Mail" echo "pizza - sent small ASCII-Icons by Mail"
echo "--------------------------------------" echo "--------------------------------------"
echo "Usage: -p Send a pizza (default)" echo "Usage: -p Send a pizza (default)"
@ -71,4 +70,4 @@ if [ ! $PIZZARCV ]; then
fi fi
mail -s "${PIZZAUSER} sent you a ${PIZZAART} on ${PIZZAHOST}!" -S from=${PIZZASEND} ${PIZZARCV} < "${PIZZAINC}/${PIZZAART}" mail -s "${PIZZAUSER} sent you a ${PIZZAART} on ${PIZZAHOST}!" -S from=${PIZZASEND} ${PIZZARCV} < "${PIZZAINC}/${PIZZAART}"
exit 0 exit 0