Authored by 姜枫

fix merge bug

... ... @@ -19,11 +19,8 @@ app.on('mount', function(parent) {
});
app.use(global.yoho.hbs({
extname: '.hbs',
<<<<<<< HEAD
defaultLayout: 'layout',
layoutsDir: doraemon,
=======
>>>>>>> release/node-gzip
partialsDir: path.join(__dirname, 'views/partial'),
views: path.join(__dirname, 'views/action'),
helpers: Object.assign({}, global.yoho.helpers, helpers)
... ...
... ... @@ -39,11 +39,7 @@
"request-promise": "^3.0.0",
"serve-favicon": "^2.3.0",
"uuid": "^2.0.3",
<<<<<<< HEAD
"yoho-node-lib": "^0.1.24",
=======
"yoho-node-lib": "0.1.27",
>>>>>>> release/node-gzip
"yoho-zookeeper": "^1.0.3"
},
"devDependencies": {
... ...