From 034e2d611d4b5ad1de9aa73f9bd0863aea9e1ccb Mon Sep 17 00:00:00 2001
From: Alex P <thealexpaxton@gmail.com>
Date: Wed, 29 Mar 2017 11:03:14 -0700
Subject: [PATCH] Resolve conflict

---
 ui/src/shared/components/CustomTimeRange.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/shared/components/CustomTimeRange.js b/ui/src/shared/components/CustomTimeRange.js
index 7a26a985a3..5f5d0e70d2 100644
--- a/ui/src/shared/components/CustomTimeRange.js
+++ b/ui/src/shared/components/CustomTimeRange.js
@@ -46,7 +46,7 @@ class CustomTimeRange extends Component {
 
     return (
       <div className={classNames("custom-time-range", {show: isVisible})} style={{display: 'flex'}}>
-        <button className="btn btn-sm btn-info" onClick={onToggle}>
+        <button className="btn btn-sm btn-info custom-time-range--btn" onClick={onToggle}>
           <span className="icon clock"></span>
           {`${moment(lower).format('MMM Do HH:mm')} to ${moment(upper).format('MMM Do HH:mm')}`}
           <span className="caret"></span>