diff options
| author | Ricardo Carrillo Cruz <emaildericky@gmail.com> | 2011-01-25 15:33:19 +0100 |
|---|---|---|
| committer | Ricardo Carrillo Cruz <emaildericky@gmail.com> | 2011-01-25 15:33:19 +0100 |
| commit | 3ad22216eee67abfabb28efe2561f0fdcf10e6e1 (patch) | |
| tree | f4288525d1ec55edfcd48dbb83cb913af95a001b /tools | |
| parent | 34d1022e8fbcfe2b6aaf30c6916ad01f0fe1769c (diff) | |
| parent | 07f39806f3b82d5d06371758e3efe597a47434ed (diff) | |
Fixed merge conflict
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/pip-requires | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/pip-requires b/tools/pip-requires index 895e81eb3..3587df644 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -27,4 +27,5 @@ PasteDeploy paste sqlalchemy-migrate netaddr +sphinx glance |