diff options
| author | fragosti <francesco.agosti93@gmail.com> | 2018-08-31 02:52:08 +0800 |
|---|---|---|
| committer | fragosti <francesco.agosti93@gmail.com> | 2018-08-31 02:52:08 +0800 |
| commit | c3361bb86e4b022c65b7dc657827b78efca9be41 (patch) | |
| tree | 0d14f731440f9e7f0fc83f64b566d1e0464d631b /packages | |
| parent | fd5ad69c268ef5411901d8ff24e429a7e0b4f888 (diff) | |
| download | dexon-sol-tools-c3361bb86e4b022c65b7dc657827b78efca9be41.tar dexon-sol-tools-c3361bb86e4b022c65b7dc657827b78efca9be41.tar.gz dexon-sol-tools-c3361bb86e4b022c65b7dc657827b78efca9be41.tar.bz2 dexon-sol-tools-c3361bb86e4b022c65b7dc657827b78efca9be41.tar.lz dexon-sol-tools-c3361bb86e4b022c65b7dc657827b78efca9be41.tar.xz dexon-sol-tools-c3361bb86e4b022c65b7dc657827b78efca9be41.tar.zst dexon-sol-tools-c3361bb86e4b022c65b7dc657827b78efca9be41.zip | |
Remove conflict strings
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/website/ts/pages/landing/landing.tsx | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx index 5a82576a1..c8dc2fc74 100644 --- a/packages/website/ts/pages/landing/landing.tsx +++ b/packages/website/ts/pages/landing/landing.tsx @@ -44,14 +44,12 @@ const THROTTLE_TIMEOUT = 100; const WHATS_NEW_TITLE = 'V2 of the 0x Protocol is now live!'; // TODO: Update this url const WHATS_NEW_URL = 'https://blog.0xproject.com/18-ideas-for-0x-relayers-in-2018-80a1498b955f'; -<<<<<<< HEAD const TITLE_STYLE: React.CSSProperties = { fontFamily: 'Roboto Mono', color: colors.grey, fontWeight: 300, letterSpacing: 3, }; -======= const ROTATING_LIST = [ 'tokens', 'game items', @@ -63,7 +61,6 @@ const ROTATING_LIST = [ 'cats', 'everything', ]; ->>>>>>> Add TypedText component and use it on landing page const relayerProjects: Project[] = [ { |