Browse Source

Docs: Fixed invalid merge in the readme.

Piotrek Koszuliński 7 years ago
parent
commit
d0054a7d90
1 changed files with 0 additions and 3 deletions
  1. 0 3
      packages/ckeditor5-build-decoupled-document/README.md

+ 0 - 3
packages/ckeditor5-build-decoupled-document/README.md

@@ -7,11 +7,8 @@ CKEditor 5 document editor build
 [![devDependency Status](https://david-dm.org/ckeditor/ckeditor5-build-decoupled-document/dev-status.svg)](https://david-dm.org/ckeditor/ckeditor5-build-decoupled-document?type=dev)
 
 The document editor build for CKEditor 5, featuring the decoupled UI editor implementation. Read more about the [document editor build](https://ckeditor.com/docs/ckeditor5/latest/builds/guides/overview.html#document-editor) and see the [demo](https://ckeditor.com/docs/ckeditor5/latest/examples/builds/document-editor.html).
-<<<<<<< HEAD
 
 ![CKEditor 5 decoupled document editor build screenshot](https://c.cksource.com/a/1/img/npm/ckeditor5-build-decoupled-document.png)
-=======
->>>>>>> stable
 
 ## Documentation