Fix merge

davidmerfield · Feb 4, 2025 · 43a2173 · 43a2173
1 parent 60ea760
commit 43a2173
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/app/templates/folders/index.js b/app/templates/folders/index.js
@@ -23,12 +23,8 @@ const localPath = require("helper/localPath");
 const sync = require("sync");
 const fix = require("sync/fix");
 
-<<<<<<< HEAD
 const FOLDER_ACCOUNT_EMAIL = config.admin.email || "[email protected]";
 const FOLDER_ACCOUNT_PASSWORD = config.session.secret || "password";
-=======
-const FOLDER_ACCOUNT_EMAIL = config.admin.email || "[email protected]";
->>>>>>> master
 
 const updates = {
   bjorn: {