diff options
| author | Chris McDonough <chrism@plope.com> | 2011-11-30 18:00:12 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-11-30 18:00:12 -0500 |
| commit | 2cab221bedf454629bf2f1e30c0f9d91cf57d455 (patch) | |
| tree | 464689e446d7550f23c4dd1ca52667c607319cc1 | |
| parent | 2de1025ec7080d2d493db5d46c8e87ed8467e806 (diff) | |
| parent | ef0da2c6c676a873285ccd19282754f981d2f3a7 (diff) | |
| download | pyramid-2cab221bedf454629bf2f1e30c0f9d91cf57d455.tar.gz pyramid-2cab221bedf454629bf2f1e30c0f9d91cf57d455.tar.bz2 pyramid-2cab221bedf454629bf2f1e30c0f9d91cf57d455.zip | |
merge conflicts
| -rw-r--r-- | docs/narr/helloworld.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/helloworld.py b/docs/narr/helloworld.py index 93a403a13..7c26c8cdc 100644 --- a/docs/narr/helloworld.py +++ b/docs/narr/helloworld.py @@ -10,6 +10,6 @@ if __name__ == '__main__': config.add_route('hello', '/hello/{name}') config.add_view(hello_world, route_name='hello') app = config.make_wsgi_app() - server = make_server('0.0.0.0', 8080) + server = make_server('0.0.0.0', 8080, app) server.serve_forever() |