fixing merge conflict

Browse Source

...

This commit is contained in:

basebuilder

2024-02-05 20:38:40 +01:00

parent 05f12b7555 01e65bef1b

commit 75583c32e2

2 changed files with 28 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

docs/federation/resolutions/drafts/013.md → docs/federation/resolutions/in-progress/013.md