Resolved conflits

jinx-vi-0 · Oct 12, 2024 · d501c65 · d501c65
2 parents 948e019 + 2dcf8ea
commit d501c65
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/backend/server.js b/backend/server.js
@@ -7,7 +7,11 @@ const crypto = require("crypto");
 dotenv.config();
 
 // Encryption and Decryption keys
+<<<<<<< HEAD
 const ENCRYPTION_KEY = Buffer.from(process.env.ENCRYPTION_KEY, 'utf-8');
+=======
+const ENCRYPTION_KEY = Buffer.from(process.env.ENCRYPTION_KEY, 'utf-8');
+>>>>>>> main
 const IV_LENGTH = 16; // For AES, this is always 16
 
 
@@ -68,6 +72,7 @@ app.get("/", async (req, res) => {
     //   return {...item,password:decrypt({iv,encryptedData})};
     // });
     res.status(200).json(passwords);
+
   } catch (error) {
     console.error("Error fetching passwords:", error);
     res.status(500).json({ success: false, message: "Internal Server Error" });