Skip to content

Commit 4b99f64

Browse files
committed
Merge for real this time, and fix stray subhead
1 parent 33b2323 commit 4b99f64

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

README.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,7 @@ To run the notebooks on your local machine, follow the following steps:
7474
1. Type `jupyter lab` from the root of your local source tree to start a [JupyterLab](https://jupyterlab.readthedocs.io/en/stable/) environment.
7575
1. Navigate to the `notebooks` directory and choose any of the notebooks there
7676

77-
78-
<<<<<<< HEAD
79-
**API documentation** can be found at [https://readthedocs.org/projects/text-extensions-for-pandas/](https://readthedocs.org/projects/text-extensions-for-pandas/).
80-
=======
8177
API documentation can be found at [https://text-extensions-for-pandas.readthedocs.io/en/latest/](https://text-extensions-for-pandas.readthedocs.io/en/latest/)
82-
>>>>>>> 73bedd82ff67d33c9858511e551902e8d6da8061
8378

8479

8580
## Contents of this repository
@@ -99,8 +94,6 @@ API documentation can be found at [https://text-extensions-for-pandas.readthedoc
9994
cover complex end-to-end NLP use cases (work in progress).
10095

10196

102-
## Instructions to run a demo notebook locally
103-
10497

10598
## Contributing
10699

0 commit comments

Comments
 (0)