fix broken commit

amyipdev · Feb 1, 2024 · 182c409 · 182c409
1 parent 7c2f390
commit 182c409
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/docs/README.md b/docs/README.md
@@ -11,8 +11,4 @@ You can find the maitainers in the [MAINTAINERS list](https://github.com/amyipde
 
 For information on how to write commits, how to protect
 your forks/branches, and the code style we use, see
-<<<<<<< HEAD
 the [STYLE guide](https://github.com/amyipdev/libacc/blob/main/docs/STYLE.md)
-=======
-the [STYLE guide](https://github.com/amyipdev/libacc/blob/main/docs/STYLE.md).
->>>>>>> 95401be (docs: establish basic documentation)