From c3361bb86e4b022c65b7dc657827b78efca9be41 Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 30 Aug 2018 11:52:08 -0700
Subject: Remove conflict strings

---
 packages/website/ts/pages/landing/landing.tsx | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'packages/website/ts')

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[] = [
     {
-- 
cgit v1.2.3