Mass media (#29)

Mass media
zapify-ui · Aug 12, 2019 · de3b0f0 · de3b0f0
2 parents d17faf2 + 7bd86fe
commit de3b0f0
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/stories/box.stories.js b/src/stories/box.stories.js
@@ -15,4 +15,8 @@ storiesOf("Box", module)
       <Box color="disabled" textColor="black" p={2} m={2.5} />
     </div>
   ))
+<<<<<<< HEAD
+  .add("User Custamisation", () => <div></div>);
+=======
   .add("User Customisation", () => <div />);
+>>>>>>> 2c10b6333265ebe017476343559288a31deadade