diff --git a/core/variables.js.rej b/core/variables.js.rej deleted file mode 100644 index 6e78cf817..000000000 --- a/core/variables.js.rej +++ /dev/null @@ -1,17 +0,0 @@ -*************** -*** 30,36 **** - - // TODO(scr): Fix circular dependencies - // goog.require('Blockly.Block'); -- goog.require('Blockly.Toolbox'); - goog.require('Blockly.Workspace'); - - ---- 30,36 ---- - - // TODO(scr): Fix circular dependencies - // goog.require('Blockly.Block'); -+ //goog.require('Blockly.Toolbox'); - goog.require('Blockly.Workspace'); - -