From fa72aa71bbab610e31161e37c00bc72180ad20c7 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Sat, 7 Dec 2019 18:26:07 +0900 Subject: [PATCH] Resolve conflict --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index d3129fa..b7c4797 100644 --- a/README.md +++ b/README.md @@ -212,9 +212,6 @@ A collection of awesome browser-side [JavaScript](https://developer.mozilla.org/ * [We.js](https://github.com/wejs/we/) - framework for real time apps, sites or blogs. * [Hatch.js](https://github.com/inventures/hatchjs) - CMS platform with social features. * [TaracotJS](https://github.com/xtremespb/taracotjs-generator/) - fast and minimalist CMS based on Node.js. -* [Nodizecms](https://github.com/nodize/nodizecms) - CMS for CoffeeScript lovers -* [Cody](https://github.com/jcoppieters/cody) - CMS with WSYWYG editor -* [PencilBlue](https://github.com/pencilblue/pencilblue/) - CMS and blogging platform * [Strapi](https://github.com/strapi/strapi) - Headless CMS to easily build customizable APIs * [Nodizecms](https://github.com/nodize/nodizecms) - CMS for CoffeeScript lovers. * [Cody](https://github.com/jcoppieters/cody) - CMS with WSYWYG editor.