Home Explore Help
Sign In
pointToNetwork
/
server
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

hebing

guhongwei 2 years ago
parent
56edb33d45 ce0b8bad41
commit
d8743acc80
2 changed files with 5 additions and 0 deletions
Split View Show Diff Stats
  1. 1 0
      README.md
  2. 4 0
      ecosystem.config.js

+ 1 - 0
README.md
View File 

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

+ 4 - 0
ecosystem.config.js
View File 

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