From 46387e22999c81b8d5129c209ed2aff77c6d64b5 Mon Sep 17 00:00:00 2001 From: iou1name Date: Fri, 18 May 2018 08:53:02 -0400 Subject: [PATCH] finish merging readme --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index 5bb1216..b485b62 100644 --- a/README.md +++ b/README.md @@ -32,12 +32,8 @@ tracker_bot = Udon auth_msg = BOT #oppaitime-announce iou1name SpaghettiIsAFaggot watch_dir = /home/iou1name/torrent/oppaitime/Watch/ cookies_txt = cookies.txt -<<<<<<< HEAD -tags = English,Dual Language,subs -blacklist = Loose -======= tags = [English,!Manga],[Manga,English,Archived],[Dual Language],[Softsubs] ->>>>>>> logictags +blacklist = Loose [redacted] server = irc.scratch-network.net