fixed comma error for merge.

2015-03-26 09:53:22 -04:00
parent b3174eeadf 8a357dd48a
commit 4cad7c1aee
4 changed files with 45 additions and 5 deletions
--- a/controllers/bonfire.js
+++ b/controllers/bonfire.js
@@ -2,7 +2,7 @@ var _ = require('lodash'),
    debug = require('debug')('freecc:cntr:bonfires'),
    Bonfire = require('./../models/Bonfire'),
    User = require('./../models/User'),
-    resources = require('./resources')
+    resources = require('./resources'),
    MDNlinks = require('./../seed_data/bonfireMDNlinks');

 /**