Update hichess.md

H-a-y-k · Jun 29, 2020 · 6df9bf2 · 6df9bf2
1 parent aba5520
commit 6df9bf2
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/docs/hichess.md b/docs/hichess.md
@@ -632,7 +632,3 @@ Calls `CellWidget.unmark` for each cell.
 ```
 
 A convenience method that sets the property `flipped` to True.
-<<<<<<< HEAD
-=======
-
->>>>>>> 10b80304c65b9623a9a9ff21b12d92a79eaea8ef