annotate .svn/pristine/d0/d003fbdebc52ec191d88feaebbdc5535c6333033.svn-base @ 1485:c8d3ad483bea redmine-2.4-integration

Fix stray merge markers
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Wed, 15 Jan 2014 13:34:12 +0000
parents 038ba2d95de8
children
rev   line source
Chris@1296 1 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'watchers/new', :locals => {:watched => @watched}) %>');
Chris@1296 2 showModal('ajax-modal', '400px');
Chris@1296 3 $('#ajax-modal').addClass('new-watcher');