From d8117494d1f968bb6452bcd3a98ab6141959699c Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Tue, 28 Feb 2017 18:18:17 -0500
Subject: [PATCH] Cleaning up after merge conflict.

---
 graph/loaders/comments.js | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/graph/loaders/comments.js b/graph/loaders/comments.js
index 6c9d4bcbc..afa79ea5c 100644
--- a/graph/loaders/comments.js
+++ b/graph/loaders/comments.js
@@ -39,14 +39,7 @@ const getCountsByAssetID = (context, asset_ids) => {
 /**
  * Returns the comment count for all comments that are public based on their
  * parent ids.
- * @param {Object}        
- 
- 
- 
- 
- 
- 
- graph context
+ *
  * @param {Array<String>} parent_ids  the ids of parents for which there are
  *                                    comments that we want to get
  */
@@ -284,7 +277,7 @@ const genRecentComments = (_, ids) => {
  * @return {Promise}       resolves to the comments
  */
 const genComments = ({user}, ids) => {
-  let comments
+  let comments;
   if (user && user.hasRoles('ADMIN')) {
     comments = CommentModel.find({
       id: {
@@ -300,11 +293,8 @@ const genComments = ({user}, ids) => {
         $in: ['NONE', 'ACCEPTED']
       }
     });
+  }
   return comments.then(util.singleJoinBy(ids, 'id'));
-    
- */
-const genCommentsByID = (context, ids) => {
-
 };
 
 /**