wilderjds
/
syncthing-resolve-conflicts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove unused bold variable

Browse Source
master
Dominik Schrempf 6 years ago
parent 7acd52ecb5
commit cfd35126f1
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      syncthing-resolve-conflicts

4
syncthing-resolve-conflicts
Unescape View File

@ -131,7 +131,7 @@ while [[ -n "$1" ]]; do
done done
# Check if messages are to be printed using color. # Check if messages are to be printed using color.
unset ALL_OFF BOLD BLUE GREEN RED YELLOW unset ALL_OFF BLUE GREEN RED YELLOW
if [[ -t 2 && $USE_COLOR = "y" ]]; then if [[ -t 2 && $USE_COLOR = "y" ]]; then
# Prefer terminal safe colored and bold text when tput is supported. # Prefer terminal safe colored and bold text when tput is supported.
if tput setaf 0 &>/dev/null; then if tput setaf 0 &>/dev/null; then
@ -148,7 +148,7 @@ if [[ -t 2 && $USE_COLOR = "y" ]]; then
YELLOW="\\e[1;33m" YELLOW="\\e[1;33m"
fi fi
fi fi
readonly ALL_OFF BOLD BLUE GREEN RED YELLOW readonly ALL_OFF BLUE GREEN RED YELLOW
if [ -z "$(command -v "${diffprog%% *}")" ] && (( ! OUTPUTONLY )); then if [ -z "$(command -v "${diffprog%% *}")" ] && (( ! OUTPUTONLY )); then
error "Cannot find the $diffprog binary required for viewing differences." error "Cannot find the $diffprog binary required for viewing differences."

Write Preview
Loading…
Cancel
Save