Fix merge conflicts

This commit is contained in:
Dylan Araps 2016-10-04 08:39:00 +11:00
commit 06281daed8
6 changed files with 66 additions and 27 deletions

View file

@ -48,7 +48,6 @@ printinfo () {
info linebreak
info cols
info linebreak
}
@ -266,7 +265,7 @@ block_height=1
progress_char_elapsed="-"
progress_char_total="="
# Progress vorder
# Progress border
# --progress_border on/off
progress_border="on"