conflict fixed

Antonino Tramontana · Antonino Tramontana · commit f3b9b384b7c4 · 2020-04-15T00:37:48.000+02:00
diff --git a/src/components/Activity.vue b/src/components/Activity.vue
@@ -1818,6 +1818,7 @@ export default {
                     this.setTooltip("");
                     this.setHelpUrl("");
                  }
+           };
 
            Blockly.Python['coderbot_music_pause_std'] = function(block) {
                var value_duration = Blockly.Python.valueToCode(block, 'duration', Blockly.Python.ORDER_ATOMIC);

Original file line number	Diff line number	Diff line change
`@@ -1818,6 +1818,7 @@ export default {`
`1818`	`1818`	`this.setTooltip("");`
`1819`	`1819`	`this.setHelpUrl("");`
`1820`	`1820`	`}`
	`1821`	`+ };`
`1821`	`1822`
`1822`	`1823`	`Blockly.Python['coderbot_music_pause_std'] = function(block) {`
`1823`	`1824`	`var value_duration = Blockly.Python.valueToCode(block, 'duration', Blockly.Python.ORDER_ATOMIC);`