Add note about #270

ipfs · Apr 12, 2023 · 176ef5e · 176ef5e
1 parent 84f02c8
commit 176ef5e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 174 deletions.
diff --git a/README.md b/README.md
@@ -155,7 +155,6 @@ See [CODEOWNERS](./docs/CODEOWNERS) for the current maintainers list.  Governanc
 
 ### Why is this named "Boxo"?
 See https://github.com/ipfs/boxo/issues/215. 
->>>>>>> 15bf447c0 (Added FAQ and README updates)
 
 ### Additional FAQs
 See [docs/FAQ.md](./docs/FAQ.md).