diff options
| author | Chris McDonough <chrism@plope.com> | 2013-10-02 16:09:57 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-10-02 16:09:57 -0400 |
| commit | 9c3c9a8075f250122d7827a71b6217213180fe70 (patch) | |
| tree | 39ebca0f2dbdd352a1d94d17c33acbb61a02393a /docs/conf.py | |
| parent | af5fa07ca2fcc48ab357c0db4e1301bb960addca (diff) | |
| parent | a2d4c260952a8e2329df0c4a66d7239f2e8d0652 (diff) | |
| download | pyramid-9c3c9a8075f250122d7827a71b6217213180fe70.tar.gz pyramid-9c3c9a8075f250122d7827a71b6217213180fe70.tar.bz2 pyramid-9c3c9a8075f250122d7827a71b6217213180fe70.zip | |
fix merge conflict
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/docs/conf.py b/docs/conf.py index ee852aa51..3b6e75a17 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -73,9 +73,6 @@ intersphinx_mapping = { 'http://docs.pylonsproject.org/projects/deform/en/latest', None), 'sqla': ('http://docs.sqlalchemy.org/en/latest', None), - 'beaker': ( - 'http://docs.pylonsproject.org/projects/pyramid_beaker/en/latest', - None), 'who': ('http://docs.repoze.org/who/latest', None), 'python': ('http://docs.python.org', None), 'python3': ('http://docs.python.org/3', None), |