Merge branch 'feature/kevin/email_notifications_panel' of https://github.com/edx/edx-platform into feature/kevin/email_notifications_panel

2013-07-30 00:56:06 -04:00
parent 0207255e1f 8f98a1c2be
commit 79994b5d69
1 changed files with 0 additions and 2 deletions
--- a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
+++ b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
@@ -449,8 +449,6 @@ if Backbone?
          type: "POST"
          error: () =>
            $('input.email-setting').removeAttr('checked')
-
-            
      else
        DiscussionUtil.safeAjax
          url: DiscussionUtil.urlFor("disable_notifications")