Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix bad conflict resolution
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Fri, 12 Mar 2010 16:53:18 +0100
changeset 4903 627fcd90e08f
parent 4902 4e67a538e476
child 4905 cc94a3f3321f
fix bad conflict resolution
utils.py file | annotate | diff | comparison | revisions 
--- a/utils.py	Fri Mar 12 16:23:21 2010 +0100
+++ b/utils.py	Fri Mar 12 16:53:18 2010 +0100
@@ -160,7 +160,7 @@
             warn('[3.7] specifying jsoncall is not needed anymore',
                  DeprecationWarning, stacklevel=2)
         self.add_post_inline_script(u"""jQuery(CubicWeb).one('server-response', function(event) {
-});""" % jscode)
+%s});""" % jscode)
 
 
     def add_js(self, jsfile):
cubicweb