commit with merge conflict

1 files changed, 9 insertions, 0 deletions

diff --git a/index.js b/index.js
index 53e4c4b..13d3244 100644
--- a/index.js
+++ b/index.js
@@ -8,6 +8,7 @@ var viewConfig = {
   data: [
     {type: 'entry', query: '*'},
     {type: 'page', query: '*'},
+    {type: 'testimonial', query: '*'},
   ]
 }
 
@@ -45,11 +46,19 @@ var app = okcms.createApp({
       body: {type: 'text'},
       disabled: {type: 'flag'},
     },
+    testimonial: {
+      id: {type: 'string', hidden: true},
+      title: {type: 'string'},
+      body: {type: 'text'},
+      byline: {type: 'string'},
+      disabled: {type: 'flag'},
+    },
   },
 
   resources: [
     { type: 'entry' },
     { type: 'page' },
+    { type: 'testimonial' },
   ],
 
   views: {