remove merge conflict marker from README.md

3 years ago · 6fc7e88e4a
parent 485ddc2841
commit 6fc7e88e4a
1 changed files with 0 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -369,7 +369,6 @@ integration = {
  }
 }
 ```
->>>>>>> main

 ## List of colorschemes