mirror of
https://github.com/lucaspalomodevelop/JSSTE.git
synced 2026-03-13 07:19:37 +00:00
merging #1
This commit is contained in:
commit
988287787a
20
index.js
20
index.js
@ -5,26 +5,6 @@ app.config = {
|
||||
pagePath: __dirname + "\\src\\pages",
|
||||
};
|
||||
|
||||
<<<<<<< HEAD
|
||||
"templatePath":__dirname+"\\src\\templates",
|
||||
"pagePath":__dirname+"\\src\\pages"
|
||||
|
||||
};
|
||||
|
||||
app.render = engine.render;
|
||||
|
||||
// app.getTemplateNameFromPage = function(pageName)
|
||||
// {
|
||||
// return app.pages.get(pageName)["_TEMPLATE_"]
|
||||
// }
|
||||
|
||||
=======
|
||||
app.render = engine.render;
|
||||
>>>>>>> 15070407cefad5bcf866cedb53b9e41d47333d9b
|
||||
|
||||
// app.getTemplateNameFromPage = function(pageName)
|
||||
// {
|
||||
// return app.pages.get(pageName)["_TEMPLATE_"]
|
||||
// }
|
||||
|
||||
module.exports = app;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user