From 90346fd7b4115e0a83eb3a395b22558a5279e7d3 Mon Sep 17 00:00:00 2001
From: Tom Gallacher <tomgallacher23@gmail.com>
Date: Fri, 9 Dec 2016 15:09:54 +0000
Subject: [PATCH] Fix merge issue

---
 ui/stories/index.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/stories/index.js b/ui/stories/index.js
index 23ea6954..eb23b7e5 100644
--- a/ui/stories/index.js
+++ b/ui/stories/index.js
@@ -16,8 +16,8 @@ const {
   Tabs,
   Tab,
   Toggle,
-  Widget
-  Radio,
+  Widget,
+  Radio
 } = require('../src/');
 
 const styles = {
@@ -129,7 +129,6 @@ storiesOf('Checkbox', module)
     <Checkbox disabled />
   ));
 
-<<<<<<< HEAD
 storiesOf('Tabs', module)
   .add('Default', () => (
     <Tabs name='my-tab-group'>
@@ -163,10 +162,12 @@ storiesOf('Widget', module)
       <p>Some text</p>
     </Widget>
   ))
-=======
+
 storiesOf('Radio', module)
   .add('Default', () => (
-    <Radio />
+    <Radio>
+     Video killed the radio star
+    </Radio>
   ))
   .add('Checked', () => (
     <Radio checked onChange={function noop() {}} />
@@ -174,4 +175,3 @@ storiesOf('Radio', module)
   .add('Disabled', () => (
     <Radio disabled />
   ));
->>>>>>> Add Radio Button