From 724aff27b54ba64269a4db354305335503b79be6 Mon Sep 17 00:00:00 2001
From: Zixaphir <zixaphirmoxphar@gmail.com>
Date: Sun, 4 Aug 2013 23:50:53 -0700
Subject: [PATCH] Wow. Just... oops.

---
 builds/appchan-x.user.js  | 3 ---
 builds/crx/script.js      | 2 --
 src/General/Config.coffee | 6 ------
 src/General/Main.coffee   | 2 --
 4 files changed, 13 deletions(-)

diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js
index 810bcd466..a29024470 100644
--- a/builds/appchan-x.user.js
+++ b/builds/appchan-x.user.js
@@ -198,7 +198,6 @@
         'Auto Hide QR': [true, 'Automatically hide the quick reply when posting.'],
         'Open Post in New Tab': [true, 'Open new threads or replies to a thread from the index in a new tab.'],
         'Remember Subject': [false, 'Remember the subject field, instead of resetting after posting.'],
-        'Remember QR Size': [false, 'Remember the size of the Quick reply.'],
         'Remember Spoiler': [false, 'Remember the spoiler state, instead of resetting after posting.'],
         'Remember QR Size': [false, 'Remember the size of the quick reply\'s comment field.'],
         'Cooldown': [true, 'Indicate the remaining time before posting again.'],
@@ -14652,7 +14651,6 @@
         'Settings': Settings,
         'Announcement Hiding': PSAHiding,
         'Fourchan thingies': Fourchan,
-        'Emoji': Emoji,
         'Color User IDs': IDColor,
         'Remove Spoilers': RemoveSpoilers,
         'Custom CSS': CustomCSS,
@@ -14689,7 +14687,6 @@
         'Reveal Spoilers': RevealSpoilers,
         'Image Loading': ImageLoader,
         'Image Hover': ImageHover,
-        'Fappe Tyme': FappeTyme,
         'Comment Expansion': ExpandComment,
         'Thread Expansion': ExpandThread,
         'Thread Excerpt': ThreadExcerpt,
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 51ee55042..6eb401ded 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -14632,7 +14632,6 @@
         'Settings': Settings,
         'Announcement Hiding': PSAHiding,
         'Fourchan thingies': Fourchan,
-        'Emoji': Emoji,
         'Color User IDs': IDColor,
         'Remove Spoilers': RemoveSpoilers,
         'Custom CSS': CustomCSS,
@@ -14669,7 +14668,6 @@
         'Reveal Spoilers': RevealSpoilers,
         'Image Loading': ImageLoader,
         'Image Hover': ImageHover,
-        'Fappe Tyme': FappeTyme,
         'Comment Expansion': ExpandComment,
         'Thread Expansion': ExpandThread,
         'Thread Excerpt': ThreadExcerpt,
diff --git a/src/General/Config.coffee b/src/General/Config.coffee
index 4afc9e4db..ac6668092 100644
--- a/src/General/Config.coffee
+++ b/src/General/Config.coffee
@@ -269,12 +269,6 @@ Config =
         false
         'Remember the subject field, instead of resetting after posting.'
       ]
-      <% if (type === 'userscript') { %>
-      'Remember QR Size': [
-        false
-        'Remember the size of the Quick reply.'
-      ]
-      <% } %>
       'Remember Spoiler': [
         false
         'Remember the spoiler state, instead of resetting after posting.'
diff --git a/src/General/Main.coffee b/src/General/Main.coffee
index 959783d66..a2699cc2e 100644
--- a/src/General/Main.coffee
+++ b/src/General/Main.coffee
@@ -117,7 +117,6 @@ Main =
       'Settings':                 Settings
       'Announcement Hiding':      PSAHiding
       'Fourchan thingies':        Fourchan
-      'Emoji':                    Emoji
       'Color User IDs':           IDColor
       'Remove Spoilers':          RemoveSpoilers
       'Custom CSS':               CustomCSS
@@ -154,7 +153,6 @@ Main =
       'Reveal Spoilers':          RevealSpoilers
       'Image Loading':            ImageLoader
       'Image Hover':              ImageHover
-      'Fappe Tyme':               FappeTyme
       'Comment Expansion':        ExpandComment
       'Thread Expansion':         ExpandThread
       'Thread Excerpt':           ThreadExcerpt