From 6e3ee8f5fa9943b292b35d2df62aaeeef0a54d2e Mon Sep 17 00:00:00 2001
From: John David Pressman <jd@jdpressman.com>
Date: Mon, 5 Aug 2019 17:47:38 -0700
Subject: [PATCH] Remove undeleted merge conflict markers on homepage

---
 gitlab-pages/website/pages/en/index.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gitlab-pages/website/pages/en/index.js b/gitlab-pages/website/pages/en/index.js
index f7ced2fe3..f949a6ecd 100644
--- a/gitlab-pages/website/pages/en/index.js
+++ b/gitlab-pages/website/pages/en/index.js
@@ -95,13 +95,10 @@ class HomeSplash extends React.Component {
         <div className="inner">
           <ProjectTitle siteConfig={siteConfig} />
           <PromoSection>
-<<<<<<< HEAD
             <Button href={docUrl('setup/installation.html')}>Get Started</Button>
             <Button href={docUrl('tutorials/get-started/tezos-taco-shop-smart-contract.html')}>Tutorials</Button>
-=======
             <Button href={docUrl('setup-installation.html')}>Get Started</Button>
             <Button href={docUrl('tutorials/get-started/tezos-taco-shop-smart-contract')}>Tutorials</Button>
->>>>>>> Fix broken link to tutorials on front page of ligolang site
             <Button href={docUrl('contributors/origin.html')}>Contribute</Button>
           </PromoSection>
         </div>