From 480cf10c96619966e1cf689841142003b6300753 Mon Sep 17 00:00:00 2001
From: Tuukka Turu <tuukka.turu@druid.fi>
Date: Thu, 19 Mar 2020 14:24:51 +0200
Subject: [PATCH] Fix conflict

---
 src/components/button/readme.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/button/readme.md b/src/components/button/readme.md
index fc46e112..6fe6562b 100644
--- a/src/components/button/readme.md
+++ b/src/components/button/readme.md
@@ -71,6 +71,7 @@ Something awesome!
 
 <!-- Auto Generated Below -->
 
+
 ## Properties
 
 | Property    | Attribute    | Description | Type                                                                           | Default                  |
@@ -79,6 +80,7 @@ Something awesome!
 | `iconRight` | `icon-right` |             | `string`                                                                       | `undefined`              |
 | `variant`   | `variant`    |             | `ButtonVariants.default \| ButtonVariants.outline \| ButtonVariants.secondary` | `ButtonVariants.default` |
 
+
 ## Dependencies
 
 ### Depends on
@@ -86,13 +88,12 @@ Something awesome!
 - [hy-icon](../icon)
 
 ### Graph
-
 ```mermaid
 graph TD;
   hy-button --> hy-icon
   style hy-button fill:#f9f,stroke:#333,stroke-width:4px
 ```
 
----
+----------------------------------------------
 
 HY component demo
-- 
GitLab