finish merging readme

This commit is contained in:
iou1name 2018-05-18 08:53:02 -04:00
parent 32d430c8e5
commit 46387e2299

View File

@ -32,12 +32,8 @@ tracker_bot = Udon
auth_msg = BOT #oppaitime-announce iou1name SpaghettiIsAFaggot auth_msg = BOT #oppaitime-announce iou1name SpaghettiIsAFaggot
watch_dir = /home/iou1name/torrent/oppaitime/Watch/ watch_dir = /home/iou1name/torrent/oppaitime/Watch/
cookies_txt = cookies.txt cookies_txt = cookies.txt
<<<<<<< HEAD
tags = English,Dual Language,subs
blacklist = Loose
=======
tags = [English,!Manga],[Manga,English,Archived],[Dual Language],[Softsubs] tags = [English,!Manga],[Manga,English,Archived],[Dual Language],[Softsubs]
>>>>>>> logictags blacklist = Loose
[redacted] [redacted]
server = irc.scratch-network.net server = irc.scratch-network.net