From cbb299eb5ca01b50bf9b9fd96e3e868a873218d7 Mon Sep 17 00:00:00 2001 From: Ethan Edwards Date: Tue, 19 May 2020 23:38:39 -0400 Subject: [PATCH] Nope fixed this time --- scripts/dracula.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/dracula.sh b/scripts/dracula.sh index 987450a..11d16be 100755 --- a/scripts/dracula.sh +++ b/scripts/dracula.sh @@ -20,10 +20,7 @@ main() show_network=$(get_tmux_option "@dracula-show-network" true) show_weather=$(get_tmux_option "@dracula-show-weather" true) show_fahrenheit=$(get_tmux_option "@dracula-show-fahrenheit" true) -<<<<<<< HEAD -======= show_powerline=$(get_tmux_option "@dracula-show-powerline" false) ->>>>>>> 4084fd83c8f5b4a71eb1be8e9421c1a68cff4c3d show_military=$(get_tmux_option "@dracula-military-time" false) # Dracula Color Pallette