| 
					
				 | 
			
			
				@@ -1,51 +1,4 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 module.exports = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-<<<<<<< HEAD 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  prod: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    'index': './src/js/index.js',   
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    'service': './src/js/service.js', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    'register': './src/js/register.js', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    'technologyTrading': './src/js/technologyTrading.js', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    'thinkTank': './src/js/thinkTank.js', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    'technologyFinancial': './src/js/technologyFinancial.js', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    'technologyTrading/achievement': './src/js/technologyTrading/achievement.js', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    'technologyTrading/demand': './src/js/technologyTrading/demand.js', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  watch: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    'index': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      'webpack/hot/only-dev-server', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      './src/js/index.js' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    ],   
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-     'service': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      'webpack/hot/only-dev-server', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      './src/js/service.js' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    'register': ['webpack-dev-server/client?http://127.0.0.1:80', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      'webpack/hot/only-dev-server', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      './src/js/register.js' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-   'technologyTrading': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    'webpack/hot/only-dev-server', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    './src/js/technologyTrading.js' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-   'thinkTank': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-   'webpack/hot/only-dev-server', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    './src/js/thinkTank.js' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    'technologyFinancial': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-   'webpack/hot/only-dev-server', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    './src/js/technologyFinancial.js' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    'technologyTrading/achievement': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    'webpack/hot/only-dev-server', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    './src/js/technologyTrading/achievement.js' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    'technologyTrading/demand': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    'webpack/hot/only-dev-server', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    './src/js/technologyTrading/demand.js' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-======= 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     prod: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         'index': './src/js/index.js', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         'service': './src/js/service.js', 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -116,4 +69,3 @@ module.exports = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				->>>>>>> 4ace6e92cdaa32f477668bc26ce75518a81d55d6 
			 |