fix: conflict

Author: teramotodaiki

src/hackforplay/object/object.js

@@ -163,7 +163,11 @@ class RPGObject extends Sprite {
 				// this.destroy();
 				Hack.maps[mapName].scene.addChild(this);
 			}
+<<<<<<< HEAD
 		} else if (typeof mapName === 'string') {
+=======
+		} else {
+>>>>>>> 7b9fa333a9a72900404134754b48ed0b7fcae146
 			Hack.log(`${mapName} は まだつくられていない`);
 		}
 		this.moveTo(

webpack.config.js

@@ -5,9 +5,9 @@ const FeelesWebpackPlugin = require('./feeles-webpack-plugin');
 const OpenBrowserPlugin = require('open-browser-webpack-plugin');
 const OfflinePlugin = require('offline-plugin');
 
-const cdn = 'https://assets.feeles.com/public/v1153/h4p.js';
+const cdn = 'https://assets.feeles.com/public/v1152/h4p.js';
 // const cdn = 'http://localhost:8081/h4p.js';
-const port = process.env.PORT || 8082;
+const port = process.env.PORT || 8083;
 const dist = 'public/';
 
 module.exports = {