Mercurial > hg > soundsoftware-site
annotate .svn/pristine/92/923ece2f09d9d50ac81cc9fdbc2753d0df52cd4c.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 <div id="admin-menu"> |
Chris@1296 | 2 <%= render_menu :admin_menu %> |
Chris@1296 | 3 </div> |