From 67f0de4b8bf49fd0c4143cccdd05ee54dcbe8516 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 15 Mar 2013 16:57:53 -0400
Subject: [PATCH] Fixed some merge conflicts

---
 .../discourse/controllers/composer_controller.js           | 1 -
 app/assets/javascripts/discourse/views/composer_view.js    | 7 +++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/composer_controller.js b/app/assets/javascripts/discourse/controllers/composer_controller.js
index 1b1df2f0a16..3afd89ba6f2 100644
--- a/app/assets/javascripts/discourse/controllers/composer_controller.js
+++ b/app/assets/javascripts/discourse/controllers/composer_controller.js
@@ -93,7 +93,6 @@ Discourse.ComposerController = Discourse.Controller.extend({
     });
   },
 
-<<<<<<< HEAD
   closeEducation: function() {
     this.set('educationClosed', true);
   },
diff --git a/app/assets/javascripts/discourse/views/composer_view.js b/app/assets/javascripts/discourse/views/composer_view.js
index cc895bc65ce..14b1a4d5f8b 100644
--- a/app/assets/javascripts/discourse/views/composer_view.js
+++ b/app/assets/javascripts/discourse/views/composer_view.js
@@ -85,13 +85,12 @@ Discourse.ComposerView = Discourse.View.extend({
     $('.composer-popup').css('bottom', sizePx);
   },
 
-  focusIn: (function() {
+  focusIn: function() {
     var controller = this.get('controller');
     if(controller) controller.resetDraftStatus();
-  }),
+  },
 
-
-  resize: (function() {
+  resize: function() {
     // this still needs to wait on animations, need a clean way to do that
     return Em.run.next(null, function() {
       var replyControl = $('#reply-control');