fix conflict

This commit is contained in:
2024-10-02 16:36:15 +03:00
344 changed files with 440 additions and 343 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View File

@@ -0,0 +1,24 @@
---
id: farmerbotupdaterecommended
title: 🔄 Farmerbot Update Recommended
image_caption: Farmer update recommedation
description: We are recommending all farmers using farmerbot to update to the new and improved version
date: 2024-02-20
taxonomies:
people: [bernadette_amanda_caster]
tags: [community, grid, tech]
news-category: [community, grid, tech]
extra:
imgPath: farmerbotupdaterecommended.png
---
<<<<<<< HEAD
After much testing, we are recommending all farmers using farmerbot to update to the new and improved version. You can find comprehensive instructions [here](https://www.manual.grid.tf/farmers/farmerbot/farmerbot_intro.html) in the manual.
=======
After much testing, we are recommending all farmers using farmerbot to update to the new and improved version. You can find comprehensive instructions [here](https://www.manual.grid.tf/documentation/farmers/farmerbot/farmerbot_intro.html) in the manual.
>>>>>>> 6dca5fcee8852eff3ce5475732c8a34c8b97bebd
<br/>
*Please find the highlights of the update [here](https://forum.threefold.io/t/update-on-new-farmerbot/4203). Thanks to all involved in bringing the upgrade live.*