Merge branch 'master' of https://github.com/H-a-y-k/hichesslib

H-a-y-k · Jun 29, 2020 · a7e02b8 · a7e02b8
2 parents cef8ef1 + 6df9bf2
commit a7e02b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -40,15 +40,17 @@ To start using the library you need to create a PySide2 application. The library
   * Interactions can be limited to only one side or for all sides (the latter is for read only boards).
   * Notifies about the game status (draw/stalemate/checkmate).
 
+### Documentation
+The the documentation is located in [docs](https://github.com/H-a-y-k/hichesslib/tree/master/docs).
+
 ### Problems and limitations
   * In order to make the library customizable with QSS, after each property change of CellWidget, the methods [unpolish](https://doc.qt.io/qt-5/qstyle.html#unpolish) and [polish](https://doc.qt.io/qt-5/qstyle.html#polish) are being called, which significantly slows down the library.
 
 ### Examples
 See [examples folder](https://github.com/H-a-y-k/hichesslib/tree/master/examples).
 
 # Status
-The library has been tested only in windows10 and windows7 (new tests for windows7 will be conducted in the future).
-It will be tested in other platforms too, but presumably, it will work fine on linux and osx as well.
+The library has been tested on Windows7, Windows10, Fedora 31.
 
 # Tests
 The library is tested with the [unittest](https://docs.python.org/3/library/unittest.html) framework.

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