Mercurial > hg > soundsoftware-site
view .svn/pristine/c7/c7d5fcf60428c25b64f2230a47dd713a94818cae.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 | cbb26bc654de |
children |
line wrap: on
line source
class Namespace::AlphaPluginController < ApplicationController def an_action render_class_and_action end end