Skip to content

Commit

Permalink
Fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
smith committed Aug 31, 2020
1 parent 4dfe35c commit 0e8e85e
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import {
ENVIRONMENT_ALL,
ENVIRONMENT_NOT_DEFINED,
} from '../../../../common/environment_filter_values';
import { useEnvironments } from '../../../hooks/useEnvironments';
import { useLocation } from '../../../hooks/useLocation';
import { useUrlParams } from '../../../hooks/useUrlParams';
import { fromQuery, toQuery } from '../Links/url_helpers';
import { useEnvironments } from '../../../hooks/useEnvironments';

function updateEnvironmentUrl(
history: History,
Expand Down

0 comments on commit 0e8e85e

Please sign in to comment.