resolve show.jade merge conflict

2015-03-08 18:50:28 +09:00
parent de91be44da aacb0070b3
commit 6283ec1174
24 changed files with 163 additions and 58 deletions
--- a/controllers/resources.js
+++ b/controllers/resources.js
@ -86,6 +86,12 @@ module.exports = {
        });
    },

+    guideToOurNonprofitProjects: function guideToOurNonprofitProjects(req, res) {
+        res.render('resources/guide-to-our-nonprofit-projects', {
+            title: 'A guide to our Nonprofit Projects'
+        });
+    },
+
    controlShortcuts: function controlShortcuts(req, res) {
        res.render('resources/control-shortcuts', {
            title: 'These Control Shortcuts will save you Hours'