summaryrefslogtreecommitdiff
path: root/stylesheets/style.css
diff options
context:
space:
mode:
Diffstat (limited to 'stylesheets/style.css')
-rw-r--r--stylesheets/style.css1
1 files changed, 0 insertions, 1 deletions
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;