Explorar o código

[spark] Fix stale merge conflict on Assist

Enrico Berti %!s(int64=10) %!d(string=hai) anos
pai
achega
4c87d2e
Modificáronse 1 ficheiros con 0 adicións e 14 borrados
  1. 0 14
      desktop/core/src/desktop/templates/ko_components.mako

+ 0 - 14
desktop/core/src/desktop/templates/ko_components.mako

@@ -134,20 +134,6 @@ from django.utils.translation import ugettext as _
           return escapeString(level.name + " (" + level.type + ")");
         };
 
-<<<<<<< HEAD
-=======
-        function resizeAssist() {
-          $(".assist").parents(".span2").height($(".assist").height() + 100);
-          $(".assist-main").height($(window).height() - 230);
-        }
-
-        var _resizeTimeout = -1;
-        $(window).on("resize", function(){
-          window.clearTimeout(_resizeTimeout);
-          _resizeTimeout = window.setTimeout(resizeAssist, 200);
-        });
-
->>>>>>> [spark] Integrate AceEditor
         self.loadAssistMain = function(force) {
           self.assist.options.onDataReceived = function (data) {
             if (data.databases) {