Skip to content

G
gitlab-ce
Commit 55bc7764 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis
Browse files
Options

Remove merge conflict markers

parent cd1dbd94
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
doc/development/fe_guide/style_guide_js.md
View file @ 55bc7764
...@@ -368,10 +368,6 @@ Please check this [rules][eslint-plugin-vue-rules] for more documentation. ...@@ -368,10 +368,6 @@ Please check this [rules][eslint-plugin-vue-rules] for more documentation.
// bad // bad
<component <component
bar="bar" /> bar="bar" />
<<<<<<< HEAD
=======
>>>>>>> upstream/master
``` ```
#### Quotes #### Quotes
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7