fix(ui): handle sigin/signout merge conflicts
parent
7397f7f4cb
commit
b90d34d0c3
|
@ -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',
|
||||
},
|
||||
|
|
|
@ -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',
|
||||
},
|
||||
|
|
|
@ -4,8 +4,6 @@ import {Links} from 'src/types/v2/links'
|
|||
const initialState: Links = {
|
||||
auths: '',
|
||||
buckets: '',
|
||||
signin: '',
|
||||
signout: '',
|
||||
dashboards: '',
|
||||
external: {
|
||||
statusFeed: '',
|
||||
|
|
|
@ -4,8 +4,6 @@
|
|||
export interface Links {
|
||||
auths: string
|
||||
buckets: string
|
||||
signin: string
|
||||
signout: string
|
||||
dashboards: string
|
||||
external: {
|
||||
statusFeed: string
|
||||
|
|
Loading…
Reference in New Issue