fe / yohobuywap-node · Commits

Go to a project

Authored by 姜枫
Commit 04ae6e3b3b7fff68d97490be840dc368bb4fd856 1 parent bc41dde4

fix merge bug

Inline Side-by-side
Showing 2 changed files with 0 additions and 7 deletions
@@ -19,11 +19,8 @@ app.on('mount', function(parent) { @@ -19,11 +19,8 @@ app.on('mount', function(parent) {
19 }); 19 });
20 app.use(global.yoho.hbs({ 20 app.use(global.yoho.hbs({
21 extname: '.hbs', 21 extname: '.hbs',
22 -<<<<<<< HEAD  
23 defaultLayout: 'layout', 22 defaultLayout: 'layout',
24 layoutsDir: doraemon, 23 layoutsDir: doraemon,
25 -=======  
26 ->>>>>>> release/node-gzip  
27 partialsDir: path.join(__dirname, 'views/partial'), 24 partialsDir: path.join(__dirname, 'views/partial'),
28 views: path.join(__dirname, 'views/action'), 25 views: path.join(__dirname, 'views/action'),
29 helpers: Object.assign({}, global.yoho.helpers, helpers) 26 helpers: Object.assign({}, global.yoho.helpers, helpers)
@@ -39,11 +39,7 @@ @@ -39,11 +39,7 @@
39 "request-promise": "^3.0.0", 39 "request-promise": "^3.0.0",
40 "serve-favicon": "^2.3.0", 40 "serve-favicon": "^2.3.0",
41 "uuid": "^2.0.3", 41 "uuid": "^2.0.3",
42 -<<<<<<< HEAD  
43 - "yoho-node-lib": "^0.1.24",  
44 -=======  
45 "yoho-node-lib": "0.1.27", 42 "yoho-node-lib": "0.1.27",
46 ->>>>>>> release/node-gzip  
47 "yoho-zookeeper": "^1.0.3" 43 "yoho-zookeeper": "^1.0.3"
48 }, 44 },
49 "devDependencies": { 45 "devDependencies": {