From 6fc7e88e4ad7ad15c6b649e86f7b83706bb6f8d7 Mon Sep 17 00:00:00 2001
From: Mat Jones <mat.jones@agilebits.com>
Date: Fri, 27 Aug 2021 13:05:02 -0400
Subject: [PATCH] remove merge conflict marker from README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 9527f1c..ab54354 100644
--- a/README.md
+++ b/README.md
@@ -369,7 +369,6 @@ integration = {
   }
 }
 ```
->>>>>>> main
 
 ## List of colorschemes