fix: Fix bad merge resolution

Author: gonfunko

packages/blockly/tests/mocha/shortcut_items_test.js

@@ -598,6 +598,7 @@ suite('Keyboard Shortcut Items', function () {
       assert.strictEqual(
         Blockly.getFocusManager().getFocusedTree(),
         mutatorWorkspace.getFlyout().getWorkspace(),
+      );
     });
   });