removed dupe text from merge

2017-05-23 10:49:01 -07:00 · 2017-05-23 10:49:01 -07:00 · 361dba7e3a
parent 48f7b9394c
commit 361dba7e3a
1 changed files with 0 additions and 2 deletions
--- a/flask/app.py
+++ b/flask/app.py
@ -133,8 +133,6 @@ class Flask(_PackageBoundObject):
    :param static_folder: the folder with static files that should be served
                          at `static_url_path`.  Defaults to the ``'static'``
                          folder in the root path of the application.
-                          folder in the root path of the application. Defaults
-                          to None.
    :param host_matching: sets the app's ``url_map.host_matching`` to the given
                          given value. Defaults to False.
    :param static_host: the host to use when adding the static route. Defaults