Fix merge conflict on button.stories.tsx

Author: wintondeshong

src/assets/scss/0-vendor/__vendor.scss

@@ -1 +1,2 @@
-@import "~bourbon", "~andculturecode-scss-grid/src/andculturecode-scss-grid";
+@import "~bourbon";
+@import "~andculturecode-scss-grid/src/andculturecode-scss-grid";

src/assets/scss/2-tools/__tools.scss

@@ -9,4 +9,5 @@
  *
  */
 
-@import "functions", "mixins";
+@import "functions";
+@import "mixins";

src/assets/scss/andculturecode-javascript-react-components.scss

@@ -23,6 +23,11 @@
  * Utilities and helper classes with ability to override anything which goes before in the triangle, eg. hide helper class
  */
 
-@import "0-vendor/__vendor", "1-settings/__settings", "2-tools/__tools",
-    "3-generic/__generic", "4-elements/__elements", "5-objects/__objects",
-    "6-components/__components", "7-utilities/__utilities";
+@import "0-vendor/__vendor";
+@import "1-settings/__settings";
+@import "2-tools/__tools";
+@import "3-generic/__generic";
+@import "4-elements/__elements";
+@import "5-objects/__objects";
+@import "6-components/__components";
+@import "7-utilities/__utilities";

src/atoms/buttons/button.stories.tsx

@@ -29,7 +29,7 @@ export const buttonIcon = () => (
         style={select("style", ButtonStyles, ButtonStyles.Primary)}
         accessibleText={text("Accessible Text", "Text for screen reader")}>
         <Icon
-            type={select("type", Icons, Icons.Close)}
+            type={select("type", Icons, Icons.Checkmark)}
             size={select("icon size", IconSizes, IconSizes.Large)}
         />
     </Button>