merge with master

lib/models/page.js

@@ -527,7 +527,6 @@ module.exports = function(crowi) {
     });
   };
 
-<<<<<<< HEAD
   // check if a given page has a local and global tempalte
   pageSchema.statics.checkIfTemplatesExist = function(path) {
     const Page = this;
@@ -577,10 +576,6 @@ module.exports = function(crowi) {
 
     pathList.push(path);
     const newPath = cutOffLastSlash(path);
-<<<<<<< HEAD
-=======
-
->>>>>>> master
     return generatePathsOnTree(newPath, pathList);
   };