balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove undeleted merge conflict markers on homepage

Browse Source
This commit is contained in:
John David Pressman 2019-08-05 17:47:38 -07:00
parent 9cc2a7a0c9
commit 6e3ee8f5fa
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gitlab-pages/website/pages/en/index.js
View File

@ -95,13 +95,10 @@ class HomeSplash extends React.Component {
<div className="inner"> <div className="inner">
<ProjectTitle siteConfig={siteConfig} /> <ProjectTitle siteConfig={siteConfig} />
<PromoSection> <PromoSection>
<<<<<<< HEAD
<Button href={docUrl('setup/installation.html')}>Get Started</Button> <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('tutorials/get-started/tezos-taco-shop-smart-contract.html')}>Tutorials</Button>
=======
<Button href={docUrl('setup-installation.html')}>Get Started</Button> <Button href={docUrl('setup-installation.html')}>Get Started</Button>
<Button href={docUrl('tutorials/get-started/tezos-taco-shop-smart-contract')}>Tutorials</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> <Button href={docUrl('contributors/origin.html')}>Contribute</Button>
</PromoSection> </PromoSection>
</div> </div>