Remove merge conflict markers

55bc7764 · Achilleas Pipinellis · cd1dbd94 · 55bc7764
Commit 55bc7764 authored Jan 11, 2018 by Achilleas Pipinellis
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

doc/development/fe_guide/style_guide_js.md doc/development/fe_guide/style_guide_js.md +0 -4

No files found.
--- a/doc/development/fe_guide/style_guide_js.md
+++ b/doc/development/fe_guide/style_guide_js.md
@@ -368,10 +368,6 @@ Please check this [rules][eslint-plugin-vue-rules] for more documentation.
        // bad
         <component
            bar="bar" />
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/master
      ```

 #### Quotes