fix error merge in dist

storybookjs · Apr 5, 2017 · 03c28f7 · 03c28f7
1 parent c14a6fa
commit 03c28f7
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/dist/modules/api/index.js b/dist/modules/api/index.js
@@ -19,13 +19,8 @@ exports.default = {
   defaultState: {
     uiOptions: {
       name: 'REACT STORYBOOK',
-<<<<<<< HEAD
       url: 'https://github.com/storybooks/react-storybook',
       sortStoriesByKind: false
-=======
-      sortStoriesByKind: false,
-      url: 'https://github.com/storybooks/react-storybook'
->>>>>>> ff5d73d52a1472f932251c1f9ee6e0762f424759
     }
   },
   load: function load(_ref, _actions) {