comparison test/functional/wikis_controller_test.rb @ 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 261b3d9a4903
children e248c7af89ec
comparison
equal deleted inserted replaced
1484:51364c0cd58f 1485:c8d3ad483bea