From 0f936e86a31831977ed4aec0438dc27672271961 Mon Sep 17 00:00:00 2001
From: Andrew Watkins <watts@influxdb.com>
Date: Tue, 11 Jul 2017 14:38:24 -0700
Subject: [PATCH] Display TICKscript on rules index

---
 ui/src/kapacitor/components/KapacitorRules.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ui/src/kapacitor/components/KapacitorRules.js b/ui/src/kapacitor/components/KapacitorRules.js
index 7ff8cc6837..2697b1dbe0 100644
--- 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">