Skip to content

G
gitlab-ce
Commit df46e511 authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files
Options

Fix conflicts for doc/development/fe_guide/style_guide_js.md

parent 79c2640b
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
doc/development/fe_guide/style_guide_js.md
View file @ df46e511
...@@ -522,10 +522,6 @@ On those a default key should not be provided. ...@@ -522,10 +522,6 @@ On those a default key should not be provided.
1. Properties in a Vue Component: 1. Properties in a Vue Component:
Check [order of properties in components rule][vue-order]. Check [order of properties in components rule][vue-order].
<<<<<<< HEAD
=======
>>>>>>> upstream/master
#### Vue and Bootstrap #### Vue and Bootstrap
......
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