diff app/views/attachments/toggle_active.js.erb @ 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 00e9a262ffe5
children
line wrap: on
line diff