Fixed some merge bugs. #4077

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2952 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-21 22:35:03 +00:00
parent 2e0cbd2840
commit ff3d0fe4db
5 changed files with 10 additions and 8 deletions
@@ -84,7 +84,7 @@ custom_values_014:
  id: 14
  value: "-7.6"
 custom_values_015: 
-  customized_type: TimeEntryActivity
+  customized_type: Enumeration
  custom_field_id: 7
  customized_id: 10
  id: 15
@@ -94,4 +94,4 @@ custom_values_016:
  custom_field_id: 7
  customized_id: 11
  id: 16
-  value: true
+  value: '1'