Resolve conflict

pull/1/head
Svein-Tore Griff With 2015-02-12 14:08:44 +01:00
commit 8c6fb5c2e5
2 changed files with 15 additions and 1 deletions

View File

@ -48,6 +48,11 @@
"machineName": "H5PEditor.VerticalTabs", "machineName": "H5PEditor.VerticalTabs",
"majorVersion": 1, "majorVersion": 1,
"minorVersion": 1 "minorVersion": 1
},
{
"machineName": "H5PEditor.QuestionSetTextualEditor",
"majorVersion": 1,
"minorVersion": 0
} }
] ]
} }

View File

@ -92,7 +92,16 @@
"name": "questions", "name": "questions",
"label": "Questions", "label": "Questions",
"type": "list", "type": "list",
"widget": "verticalTabs", "widgets": [
{
"name": "VerticalTabs",
"label": "Default"
},
{
"name": "QuestionSetTextualEditor",
"label": "Textual"
}
],
"min": 1, "min": 1,
"entity": "question", "entity": "question",
"field": { "field": {