From 182c409a8b0a7eb6227dc1c451374247d945d4cf Mon Sep 17 00:00:00 2001 From: Amy Parker Date: Wed, 31 Jan 2024 16:36:24 -0800 Subject: [PATCH] fix broken commit --- docs/README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/README.md b/docs/README.md index 7b0fa3e..23c0cde 100644 --- 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)