Display TICKscript on rules index

2017-07-11 14:38:24 -07:00 · 2017-07-11 14:38:24 -07:00 · 0f936e86a3
parent 9fb878e7e8
commit 0f936e86a3
1 changed files with 4 additions and 0 deletions
--- a/ui/src/kapacitor/components/KapacitorRules.js
+++ b/ui/src/kapacitor/components/KapacitorRules.js
@ -81,7 +81,11 @@ const KapacitorRules = ({
  )
 }

+<<<<<<< HEAD
 const PageContents = ({children, source}) =>
+=======
+const PageContents = ({children, source, tickscript, onCloseTickscript}) => (
+>>>>>>> Display TICKscript on rules index
  <div className="page">
    <div className="page-header">
      <div className="page-header__container">