From 899b08544ef900d0c3b10c7fac14fb52a9107e5c Mon Sep 17 00:00:00 2001
From: sahithi000 <21pa1a1232@vishnu.edu.in>
Date: Wed, 15 May 2024 12:56:48 +0530
Subject: [PATCH] updating changes

---
 app.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/app.js b/app.js
index 2b35bdf..5d4c436 100644
--- a/app.js
+++ b/app.js
@@ -2,17 +2,7 @@ const express = require("express")
 const bodyParser = require("body-parser")
 const axios = require("axios")
 const sgMail = require("@sendgrid/mail")
-<<<<<<< HEAD
-<<<<<<< Updated upstream
-=======
-const path=require("path")
-const bcrypt=require("bcrypt")
-const collection=require("./config.js")
 const ExpressError=require("./utils/ExpressError.js")
->>>>>>> Stashed changes
-=======
-const ExpressError=require("./utils/ExpressError.js")
->>>>>>> 5863d9a63eacb84b10eca3dc7563444fd15206a4
 
 require("dotenv").config()