fix: conflicts

Author: boazpoolman

playground/src/api/home/content-types/home/schema.json

@@ -0,0 +1,23 @@
+{
+  "kind": "singleType",
+  "collectionName": "homes",
+  "info": {
+    "singularName": "home",
+    "pluralName": "homes",
+    "displayName": "Home",
+    "description": ""
+  },
+  "options": {
+    "draftAndPublish": false
+  },
+  "pluginOptions": {},
+  "attributes": {
+    "title": {
+      "type": "string"
+    },
+    "slug": {
+      "type": "uid",
+      "targetField": "title"
+    }
+  }
+}

playground/src/api/home/controllers/home.js

@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ * home controller
+ */
+
+const { createCoreController } = require('@strapi/strapi').factories;
+
+module.exports = createCoreController('api::home.home');

playground/src/api/home/routes/home.js

@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ * home router
+ */
+
+const { createCoreRouter } = require('@strapi/strapi').factories;
+
+module.exports = createCoreRouter('api::home.home');

playground/src/api/home/services/home.js

@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ * home service
+ */
+
+const { createCoreService } = require('@strapi/strapi').factories;
+
+module.exports = createCoreService('api::home.home');

playground/src/api/page/content-types/page/schema.json

@@ -0,0 +1,19 @@
+{
+  "kind": "collectionType",
+  "collectionName": "pages",
+  "info": {
+    "singularName": "page",
+    "pluralName": "pages",
+    "displayName": "Page"
+  },
+  "options": {
+    "draftAndPublish": false
+  },
+  "pluginOptions": {},
+  "attributes": {
+    "title": {
+      "type": "string",
+      "required": true
+    }
+  }
+}

playground/src/api/page/controllers/page.js

@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ * page controller
+ */
+
+const { createCoreController } = require('@strapi/strapi').factories;
+
+module.exports = createCoreController('api::page.page');

playground/src/api/page/routes/page.js

@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ * page router
+ */
+
+const { createCoreRouter } = require('@strapi/strapi').factories;
+
+module.exports = createCoreRouter('api::page.page');

playground/src/api/page/services/page.js

@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ * page service
+ */
+
+const { createCoreService } = require('@strapi/strapi').factories;
+
+module.exports = createCoreService('api::page.page');