annotate app/models/institution.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 596803cb34fc
children
rev   line source
luis@98 1 class Institution < ActiveRecord::Base
luis@98 2 end