Sfoglia il codice sorgente

Docs: Fixed invalid merge in the readme.

Piotrek Koszuliński 7 anni fa
parent
commit
6158bb1cd5
1 ha cambiato i file con 0 aggiunte e 3 eliminazioni
  1. 0 3
      packages/ckeditor5-build-inline/README.md

+ 0 - 3
packages/ckeditor5-build-inline/README.md

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