Commit 93b817db authored by liang's avatar liang
Browse files

Solve a ignored conflict in readme.rst

parent c79bc8c5
Pipeline #1659 passed with stages
in 47 seconds
......@@ -118,11 +118,9 @@ Source Code Documentation
_________________________
The source code is accompanied with `sphinx <http://www.sphinx-doc.org/en/stable/>`_ documentation located in sub-directory *doc*.
<<<<<<< HEAD
Instractions for sphinx installation can be found `here <http://www.sphinx-doc.org/en/stable/>`_.
=======
Instractions for sphinx installation can be found `here <http://www.sphinx-doc.org/en/stable/tutorial.html#install-sphinx>`_.
>>>>>>> mmalis/E-CAM-Library-OpenQubit
The html documentation files can be obtained by executing the following command in the *doc* sub-directory
::
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment