Rebased

SpiderNitt · Jan 21, 2021 · 7716d8e · 7716d8e
1 parent 7956846
commit 7716d8e
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/api/routers/activity.js b/src/api/routers/activity.js
@@ -4,15 +4,11 @@ const Mission = require("../../database/models/Mission");
 
 Router.get("/feed", async (req, res) => {
   try {
-<<<<<<< HEAD
     const feeds = await Feed.find({ status: true })
       .populate("team")
       .populate("mission")
       .exec();
 
-=======
-    const feeds = await Feed.find({ status: true });
->>>>>>> 966e4a8... Changed status and added payment route
     const feedToBeShown = [];
     const details = {};
     for (let index = 0; index < feeds.length; index++) {