Fixed some merge conflicts

app/assets/javascripts/discourse/controllers/composer_controller.js

@@ -93,7 +93,6 @@ Discourse.ComposerController = Discourse.Controller.extend({
     });
   },
 
-<<<<<<< HEAD
   closeEducation: function() {
     this.set('educationClosed', true);
   },

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');