fix conflicts

This commit is contained in:
2024-03-05 12:04:48 +02:00
405 changed files with 9302 additions and 1924 deletions

View File

@@ -1,12 +1,12 @@
---
title: "Home"
description: "A global movement together building an open-source, community-driven, decentralized Internet from the ground up." # quotation marks to allow colons where used
description: "ThreeFold is the worlds first system enabling anyone to become a cloud and internet service provider." # quotation marks to allow colons where used
date: 2018-09-14T21:00:00-05:00
updated: 2021-02-20T14:40:00-06:00
draft: false
extra:
author: Your name here
imgPath: images/threefold_globe.png
imgPath: home/header_new.jpeg
---
@@ -41,7 +41,7 @@ ThreeFold is a peer-to-peer open-source Internet platform that connects users di
|||
<button>[Get TFT](https://library.threefold.me/info/threefold#/tokens/threefold__how_to_buy)</button>
<button>[Get TFT](https://manual.grid.tf/threefold_token/buy_sell_tft/buy_sell_tft.html)</button>
{% end %}