Commit 0fe74afb authored by Yash Saravgi's avatar Yash Saravgi
Browse files

Merge branch 'sanchit' of https://code.swecha.org/Sanchit611/kisanmarket

into homepage
parents dcb167bc 3cc23222
......@@ -24,4 +24,8 @@ app.listen((process.env.PORT || 7018), function () {
console.log("The Server Has Started! at port 7018");
});
<<<<<<< HEAD
module.exports = app
=======
module.exports=app;
>>>>>>> 3cc23222df9b1e967e4c978ff2150ddc3ca8e36d
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment