Fix remaining merge issues

This commit is contained in:
fabioberger
2019-08-16 00:34:46 +02:00
parent de036ae96a
commit bbd9c4ef67
4 changed files with 165 additions and 70 deletions

View File

@@ -4,8 +4,6 @@ import MediaQuery from 'react-responsive';
import styled, { css, withTheme } from 'styled-components';
import { Link } from 'ts/components/documentation/shared/link';
import { Link } from '@0x/react-shared';
import { Button } from 'ts/components/button';
import { DropdownProducts } from 'ts/components/dropdowns/dropdown_products';
import { DropdownResources } from 'ts/components/dropdowns/dropdown_resources';