From 7653db36fe0cb362f6775ba8be76440e4bb72585 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Thu, 12 Jul 2012 10:23:55 +0200
Subject: [PATCH] Revert "option to stop autoscroll"

This reverts commit 6726ea66320e3075451027d5362d35d77bebaf5d.

Conflicts:

	src/static/js/chat.js
---
 src/templates/pad.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/templates/pad.html b/src/templates/pad.html
index a2513347..02af9b10 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -168,10 +168,6 @@
                     <input type="checkbox" id="options-linenoscheck" checked>
                     <label for="options-linenoscheck">Line numbers</label>
                 </p>
-                <p>
-                    <input type="checkbox" id="options-scrollchat" checked>
-                    <label for="options-scrollchat">Automatically Scroll Chat</label>
-                </p>
                 <p>
                     Font type:
                     <select id="viewfontmenu">