Fix merge conflict

ckan · Jan 25, 2017 · 3330fb9 · 3330fb9
1 parent 2b72ca1
commit 3330fb9
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/ckan/config/middleware/flask_app.py b/ckan/config/middleware/flask_app.py
@@ -231,9 +231,6 @@ def ckan_after_request(response):
     # Set CORS headers if necessary
     response = set_cors_headers_for_response(response)
 
-    if flask_app.debug:
-        response.headers[u'X-CKAN-APP'] = u'Flask'
-
     return response