From 5acebfce378d7a2c3e2b29f5def97659e336a5c3 Mon Sep 17 00:00:00 2001
From: cryptofyre <cryptofyre@cryptofyre.org>
Date: Sun, 24 Apr 2022 02:48:15 -0500
Subject: [PATCH] Update README.md

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 5917cc45..4e3ea464 100644
--- a/README.md
+++ b/README.md
@@ -18,11 +18,7 @@
 </p>
 
 #### Links
-<<<<<<< HEAD
-* [Wiki](https://github.com/ciderapp/Cider/wiki)
-=======
 * [Wiki](https://docs.cider.sh)
->>>>>>> 28810c600f7a6baaae38fd1583774153932563a0
 * [Request Feature](https://github.com/ciderapp/Cider/discussions/new?category=feature-request)
 * [Report Bug](https://github.com/ciderapp/Cider/issues/new?assignees=&labels=bug&template=bug_report.md&title=%5BBUG%5D+)
 * [**View The Releases**](https://github.com/ciderapp/Cider/releases/latest)