ourworld_web/www_threefold_io
23
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Ehab Hassan
2021-10-04 16:41:04 +02:00
parent 50a923b4cd 4c4c660e3a
commit af20f992e4
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/pages/Index.vue
View File

@@ -55,13 +55,6 @@
:cta="$page.markdownPage.cta" :cta="$page.markdownPage.cta"
/> --> /> -->
<!-- <LogoShowcase
v-if="$page.markdownPage.logos.length > 0"
:id="$page.markdownPage.id"
:logos="$page.markdownPage.logos"
:main="$page.markdownPage.logosMain"
/> -->
<!-- <BrandPanel <!-- <BrandPanel
class="my-20" class="my-20"
:brand="$page.markdownPage.brandPanel" :brand="$page.markdownPage.brandPanel"
@@ -74,6 +67,12 @@
:people="$page.entries.edges" :people="$page.entries.edges"
/> />
<LogoShowcase
v-if="$page.markdownPage.logos.length > 0"
:id="$page.markdownPage.id"
:logos="$page.markdownPage.logos"
:main="$page.markdownPage.logosMain"
/>
<InTheNews <InTheNews
v-if="$page.markdownPage.inTheNews" v-if="$page.markdownPage.inTheNews"
:news="$page.markdownPage.inTheNews" :news="$page.markdownPage.inTheNews"