Mercurial > hg > soundsoftware-site
diff test/fixtures/.svn/text-base/custom_fields.yml.svn-base @ 523:0b6c82dead28 luisf
Merge from branch "cannam"
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Mon, 25 Jul 2011 14:23:37 +0100 |
parents | cbce1fd3b1b7 |
children |
line wrap: on
line diff
--- a/test/fixtures/.svn/text-base/custom_fields.yml.svn-base Mon Mar 28 18:17:06 2011 +0100 +++ b/test/fixtures/.svn/text-base/custom_fields.yml.svn-base Mon Jul 25 14:23:37 2011 +0100 @@ -129,3 +129,17 @@ field_format: date default_value: "" editable: true +custom_fields_010: + name: Overtime + min_length: 0 + regexp: "" + is_for_all: false + is_filter: false + type: TimeEntryCustomField + max_length: 0 + possible_values: "" + id: 10 + is_required: false + field_format: bool + default_value: 0 + editable: true