HUE-9077 [ksql] Fix git conflict leftovers

Review Request #14561 — Created Dec. 3, 2019 and submitted

johan
hue
master
hue
jgauthier, ranade, romain, roohi, weixia, yingc
commit 0d514af99540894218b1bfd92929293c3fcfa9f6
Author: Johan Ahlen <johan@johanahlen.com>
Date:   Tue Dec 3 13:17:48 2019 +0100

    HUE-9077 [ksql] Fix git conflict leftovers

:100644 100644 ca66cf4b81 09c156cfd2 M	desktop/libs/notebook/src/notebook/templates/editor_components.mako
Manual on Chrome
romain
  1. Ship It!
  2. 
      
johan
Review request changed

Status: Closed (submitted)

Loading...