Mirror/robosats
1
0
Fork 0
mirror of https://github.com/RoboSats/robosats.git synced 2024-12-14 03:16:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix old merge conflict on federation.md

Browse Source
This commit is contained in:
Reckless_Satoshi 2023-10-27 04:05:05 -07:00 committed by Reckless_Satoshi
parent 2361b728fc
commit 59bac99fdc
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
federation.md
View File

@ -92,15 +92,9 @@ Each RoboSats coordinator has a profile in the RoboSats app. The profile contain
- Large Limits - Can host orders with large limits. - Large Limits - Can host orders with large limits.
- DevFund donator - Donates to the DevFund the default amount or more. - DevFund donator - Donates to the DevFund the default amount or more.
<<<<<<< HEAD
Some of these badges can be objectively measured and awarded. Other badges rely on the subjectivity of the development team. These will be generously awarded and only taken away after a warning. Some of these badges can be objectively measured and awarded. Other badges rely on the subjectivity of the development team. These will be generously awarded and only taken away after a warning.
We also envision more badges in the future, for example milestones by number of trades coordinated (200, 1K, 5K, 25K, 100K, etc). We also envision more badges in the future, for example milestones by number of trades coordinated (200, 1K, 5K, 25K, 100K, etc).
=======
Some of these badges can be objectively measured and therefore awarded. Others badges rely on the subjectivity by the development team. These will be generously awarded and only taken away after a warning.
We also envision more badges in the future. For example milestones of number of trades coordinated (200, 1K, 5K, 25K, 100K, etc).
>>>>>>> 2254fa60 (Add federation basis and new coordinator form (#793))
## Timeline ## Timeline