We are idiots

2021-11-15 11:08:17 +01:00 · 2021-11-15 11:08:17 +01:00 · 3bca5bfc90
commit 3bca5bfc90
parent f75822cac1
1 changed files with 0 additions and 4 deletions
--- a/motd.sh
+++ b/motd.sh
@ -1,10 +1,6 @@
 # Fancy waifu motd

-<<<<<<< HEAD
-MOTDPATH="$HOME/src/motd"          # path to motd folder
-=======
 MOTDPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"          # path to motd folder
->>>>>>> 01b098ef55e85b9ed6e37c03428b18db0e93a44f
 CACHEFILE="/tmp/waifu.cache"          # to cache waifu state
 RESOLUTION=256                        # resolution of waifu
 CENTER=true                           # center motd?