# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1268409198 -3600
# Node ID 627fcd90e08fdff159fdbd770e3f0371cdbb610b
# Parent  4e67a538e476fe60e39eb67746b4a6acc99f4ce2
fix bad conflict resolution

diff -r 4e67a538e476 -r 627fcd90e08f utils.py
--- 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):