解决冲突

21a75806 · 邓军 · 21b08a66 · 21a75806
Commit 21a75806 authored Apr 22, 2015 by 邓军
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

forumThread.js app/controllers/mobile/forumThread.js +0 -6

No files found.
--- a/app/controllers/mobile/forumThread.js
+++ b/app/controllers/mobile/forumThread.js
@@ -687,15 +687,9 @@ router.post('/thread/:tid/comment/:cid/delete', function(req, res, next) {

 //评论列表
 router.get('/thread/:tid/comment/list', function(req, res, next) {
-<<<<<<< HEAD
-

 	var tid=req.params.tid || null;
 	var pageNo = req.query.pageNo || 1;
-=======
-    var tid = req.params.tid || null;
-    var pageNo = req.query.pageNo || 1;
->>>>>>> f2a61e4b468be1158deee3015cb171b0bede90e4
    var pageSize = req.query.pageSize || 10;

    var conditions = {