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

Merge remote-tracking branch 'origin/master'

Browse source 
Conflicts:
	src/pizza
This commit is contained in:
Oliver Rümpelein 2015-01-02 21:46:18 +01:00
commit 1ed970bf31
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/pizza
View file

@ -8,6 +8,7 @@ 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)"