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
2024-06-10 17:36:02 +03:00
parent 115a5c6f10 6dca5fcee8
commit a7e9bfec3b
832 changed files with 4085 additions and 2088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
content/newsroom/farmerbotupdaterecommended/index.md
View File

@@ -12,7 +12,11 @@ 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/>