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

df46e511 · Filipa Lacerda · 79c2640b · df46e511
Commit df46e511 authored Jan 11, 2018 by Filipa Lacerda
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
@@ -522,10 +522,6 @@ On those a default key should not be provided.

 1. Properties in a Vue Component:
  Check [order of properties in components rule][vue-order].
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/master

 #### Vue and Bootstrap