Resolve doc/ci/examples/README.md

b5f0e873 · Valery Sizov · fc88f344 · b5f0e873
Commit b5f0e873 authored Nov 27, 2018 by Valery Sizov
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

doc/ci/examples/README.md doc/ci/examples/README.md +0 -4

No files found.
--- a/doc/ci/examples/README.md
+++ b/doc/ci/examples/README.md
@@ -49,11 +49,7 @@ There's also a collection of repositories with [example projects](https://gitlab

 ## Code Quality analysis **[STARTER]**

-<<<<<<< HEAD
-[Analyze your project's Code Quality](code_quality.md).
-=======
 **(Starter)** [Analyze your project's Code Quality](code_quality.md)
->>>>>>> upstream/master

 ## Dependencies license management **[ULTIMATE]**