From 65ea7b78c50ab3da60a541237f73b13cd2e7e6d8 Mon Sep 17 00:00:00 2001
From: Fredrick Brennan <admin@8chan.co>
Date: Sun, 10 May 2015 12:51:35 +0800
Subject: Catalog: click to scroll thread

---
 stylesheets/style.css | 1 -
 1 file changed, 1 deletion(-)

(limited to 'stylesheets/style.css')

diff --git a/stylesheets/style.css b/stylesheets/style.css
index e54faf93..b36a9de9 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -1033,7 +1033,6 @@ div.boardlist a {
 #watchlist-toggle, .watchThread, .watchlist-remove, #clearList, #clearGhosts {
 	cursor: pointer;
 }
-<<<<<<< HEAD
 
 #youtube-size input {
 	width: 50px;
-- 
cgit v1.3