fix(webpack_config/config): fix merge

webpack_config/config.js

@@ -2,60 +2,6 @@
 const path = require('path')
 
 module.exports = {
-<<<<<<< HEAD
-    port: 3000,
-    title: 'React-Semantic.UI-Starter',
-    publicPath: '/',
-    srcPath: path.join(__dirname, './../common'),
-    // add these dependencies to a standalone vendor bundle
-    vendor: [
-        'react',
-        'react-dom',
-        'react-router',
-        'redux',
-        'react-router-redux',
-        'redux-thunk',
-        'semantic-ui-react',
-        'whatwg-fetch',
-        'semantic-ui-css/semantic.css',
-        'offline-plugin/runtime',
-        'prop-types'
-    ],
-    // enable babelrc
-    babel: {
-        babelrc: true
-    },
-    // your web app's manifest.json
-    manifest: {
-        name: 'React-Semantic.UI-Starter',
-        short_name: 'RSUIS',
-        description: 'https://github.com/Metnew/react-semantic.ui-starter',
-        icons: [
-            {
-                src: 'images/touch/icon-128x128.png',
-                sizes: '128x128',
-                type: 'image/png'
-            }, {
-                src: 'images/touch/apple-touch-icon.png',
-                sizes: '152x152',
-                type: 'image/png'
-            }, {
-                src: 'images/touch/ms-touch-icon-144x144-precomposed.png',
-                sizes: '144x144',
-                type: 'image/png'
-            }, {
-                src: 'images/touch/chrome-touch-icon-192x192.png',
-                sizes: '192x192',
-                type: 'image/png'
-            }
-        ],
-        start_url: '.',
-        display: 'standalone',
-        background_color: '#f7f7f7',
-        theme_color: '#1b1c1d'
-    },
-    cssModules: true
-=======
 	port: process.env.PORT || 3000,
 	title: 'React-Semantic.UI-Starter',
 	publicPath: '/' ,
@@ -119,5 +65,4 @@ module.exports = {
 		background_color: '#f7f7f7',
 		theme_color: '#009688'
 	}
->>>>>>> master
 }