Browse Source

HUE-9077 [ksql] Fix git conflict leftovers

Johan Ahlen 6 years ago
parent
commit
0d514af995

+ 0 - 1
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -2094,7 +2094,6 @@ ${ sqlSyntaxDropdown.sqlSyntaxDropdown() }
         snippetImage: '${ static("impala/art/icon_impala_48.png") }',
         sqlDialect: true
       },
-<<<<<<< HEAD
       presto: {
         placeHolder: '${ _("Example: SELECT * FROM tablename, or press CTRL + space") }',
         aceMode: 'ace/mode/presto',