From b90d34d0c311bfff2028a41256bac82d50e2a5e2 Mon Sep 17 00:00:00 2001
From: Chris Goller <goller@gmail.com>
Date: Thu, 4 Oct 2018 22:09:16 -0500
Subject: [PATCH] fix(ui): handle sigin/signout merge conflicts

---
 chronograf/ui/mocks/dummy.ts                    | 2 --
 chronograf/ui/src/shared/reducers/links.test.ts | 2 --
 chronograf/ui/src/shared/reducers/links.ts      | 2 --
 chronograf/ui/src/types/v2/links.ts             | 2 --
 4 files changed, 8 deletions(-)

diff --git a/chronograf/ui/mocks/dummy.ts b/chronograf/ui/mocks/dummy.ts
index 5928d82590..bf00c071b1 100644
--- a/chronograf/ui/mocks/dummy.ts
+++ b/chronograf/ui/mocks/dummy.ts
@@ -14,8 +14,6 @@ export const links: Links = {
   auths: '/api/v2/authorizations',
   buckets: '/api/v2/buckets',
   dashboards: '/api/v2/dashboards',
-  signin: '/api/v2/signin',
-  signout: '/api/v2/signout',
   external: {
     statusFeed: 'https://www.influxdata.com/feed/json',
   },
diff --git a/chronograf/ui/src/shared/reducers/links.test.ts b/chronograf/ui/src/shared/reducers/links.test.ts
index 48bf4cc950..06a6e783d5 100644
--- a/chronograf/ui/src/shared/reducers/links.test.ts
+++ b/chronograf/ui/src/shared/reducers/links.test.ts
@@ -8,8 +8,6 @@ const links: Links = {
   auths: '/api/v2/authorizations',
   buckets: '/api/v2/buckets',
   dashboards: '/api/v2/dashboards',
-  signin: '/api/v2/signin',
-  signout: '/api/v2/signout',
   external: {
     statusFeed: 'https://www.influxdata.com/feed/json',
   },
diff --git a/chronograf/ui/src/shared/reducers/links.ts b/chronograf/ui/src/shared/reducers/links.ts
index 2c18602aed..22c77561a0 100644
--- a/chronograf/ui/src/shared/reducers/links.ts
+++ b/chronograf/ui/src/shared/reducers/links.ts
@@ -4,8 +4,6 @@ import {Links} from 'src/types/v2/links'
 const initialState: Links = {
   auths: '',
   buckets: '',
-  signin: '',
-  signout: '',
   dashboards: '',
   external: {
     statusFeed: '',
diff --git a/chronograf/ui/src/types/v2/links.ts b/chronograf/ui/src/types/v2/links.ts
index 937fc147b4..6ba6741ab6 100644
--- a/chronograf/ui/src/types/v2/links.ts
+++ b/chronograf/ui/src/types/v2/links.ts
@@ -4,8 +4,6 @@
 export interface Links {
   auths: string
   buckets: string
-  signin: string
-  signout: string
   dashboards: string
   external: {
     statusFeed: string