Fixed some merge bugs. #4077

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2952 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Eric Davis committed 2009-10-21 22:35:03 +00:00
1 parent 2e0cbd2840
commit ff3d0fe4db
5 files changed
+10 -8

No files matched your search

@@ -17,7 +17,7 @@
class TimeEntryActivityCustomField < CustomField
def type_name
:enumeration_time_entry_activities
:enumeration_activities
end
end