Diff
1diff --git a/plugins/python/README.md b/plugins/python/README.md
2index 4968cca6da17bb1ccf31473d18579bcacbcea3cb..c1f0adef8bafd3ac281db8d7ba0654cabadf7d45 100644
3--- a/plugins/python/README.md
4+++ b/plugins/python/README.md
5@@ -1,8 +1,8 @@
6-# python plugin
7+# Python plugin
8
9-The plugin adds several aliases for useful [python](https://www.python.org/) commands.
10+The plugin adds several aliases for useful [Python](https://www.python.org/) commands.
11
12-To use it, add `python` to the plugins array of your zshrc file:
13+To use it, add `python` to the plugins array in your zshrc file:
14
15 ```zsh
16 plugins=(... python)
17@@ -10,16 +10,15 @@ plugins=(... python)
18
19 ## Aliases
20
21-<<<<<<< HEAD
22-| Command | Description |
23-| ---------------- | ------------------------------------------------------------------------------------- |
24-| `py` | Runs `python` |
25-| `ipython` | Runs the appropriate `ipython` version according to the activated virtualenv |
26-| `pyfind` | Finds .py files recursively in the current directory |
27-| `pyclean [dirs]` | Deletes byte-code and cache files from a list of directories or the current one |
28-| `pygrep <text>` | Looks for `text` in .py files |
29-| `pyuserpaths` | Add --user site-packages to PYTHONPATH, for all installed python versions. |
30-| `pyserver` | Starts an http.server on the current directory. Use `--directory` for a different one |
31+| Command | Description |
32+| ---------------- | -------------------------------------------------------------------------------------- |
33+| `py` | Runs `python` |
34+| `ipython` | Runs the appropriate `ipython` version according to the activated virtualenv |
35+| `pyfind` | Finds .py files recursively in the current directory |
36+| `pyclean [dirs]` | Deletes byte-code and cache files from a list of directories or the current one |
37+| `pygrep <text>` | Looks for `text` in `*.py` files in the current directory, recursively |
38+| `pyuserpaths` | Add user site-packages folders to `PYTHONPATH`, for Python 2 and 3 |
39+| `pyserver` | Starts an HTTP server on the current directory (use `--directory` for a different one) |
40
41 ## Virtual environments
42