Mercurial Mercurial > pub > hg > cubicweb / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cubicweb/pyramid/config.py
branch3.26
changeset 12432 2fcb53ee5178
parent 12245 cd760c411242
child 12530 9d88e1177c35
child 12562 7bb677060ebd 
--- a/cubicweb/pyramid/config.py	Tue Oct 09 16:24:12 2018 +0200
+++ b/cubicweb/pyramid/config.py	Mon Oct 29 10:04:31 2018 +0100
@@ -44,8 +44,8 @@
     cube_appobject_path = (BaseWebConfiguration.cube_appobject_path
                            | ServerConfiguration.cube_appobject_path)
 
-    options = merge_options(ServerConfiguration.options +
-                            BaseWebConfiguration.options)
+    options = merge_options(ServerConfiguration.options
+                            + BaseWebConfiguration.options)
 
     def init_log(self, *args, **kwargs):
         """Rely on logging configuration in Pyramid's .ini file, do nothing
cubicweb