Resolve conflict

2015-02-12 14:08:44 +01:00 · 2015-02-12 14:08:44 +01:00 · 8c6fb5c2e5
parent aeee49e85e 186ef396e2
commit 8c6fb5c2e5
2 changed files with 15 additions and 1 deletions
--- a/library.json
+++ b/library.json
@ -48,6 +48,11 @@
      "machineName": "H5PEditor.VerticalTabs",
      "majorVersion": 1,
      "minorVersion": 1
+    },
+    {
+      "machineName": "H5PEditor.QuestionSetTextualEditor",
+      "majorVersion": 1,
+      "minorVersion": 0
    }
  ]
 }
--- a/semantics.json
+++ b/semantics.json
@ -92,7 +92,16 @@
    "name": "questions",
    "label": "Questions",
    "type": "list",
-    "widget": "verticalTabs",
+    "widgets": [
+      {
+        "name": "VerticalTabs",
+        "label": "Default"
+      },
+      {
+        "name": "QuestionSetTextualEditor",
+        "label": "Textual"
+      }
+    ],
    "min": 1,
    "entity": "question",
    "field": {