hebing

README.md

@@ -20,3 +20,4 @@
 
 
 dev
+master

ecosystem.config.js

@@ -1,10 +1,14 @@
 "use strict";
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 const app = '商城-服务';
 =======
 const app = "商城-服务";
 >>>>>>> dev
+=======
+const app = "商城-服务";
+>>>>>>> ce0b8bad41264ac5fd5172992f5ee7827425c516
 module.exports = {
   apps: [
     {