Resolve merge conflicts

2015-05-05 14:18:28 -04:00
parent 1d5392e5c1 e77eae2643
commit 82a1680943
3 changed files with 39 additions and 2 deletions
--- a/app.js
+++ b/app.js
@@ -500,6 +500,8 @@ app.get('/api/blogger', resourcesController.bloggerCalls);

 app.get('/api/trello', resourcesController.trelloCalls);

+app.get('/api/codepen/twitter/:screenName', resourcesController.codepenResources.twitter);
+
 /**
 * Bonfire related routes
 */