mirror of
				https://github.com/zadam/trilium.git
				synced 2025-11-03 20:06:08 +01:00 
			
		
		
		
	feat: 🎸 remove conflict code
This commit is contained in:
		@@ -76,12 +76,6 @@ import etapiBackupRoute from "../etapi/backup.js";
 | 
				
			|||||||
import apiDocsRoute from "./api_docs.js";
 | 
					import apiDocsRoute from "./api_docs.js";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const csrfMiddleware = csurf({
 | 
					 | 
				
			||||||
    cookie: {
 | 
					 | 
				
			||||||
        path: ""       // empty, so cookie is valid only for the current path
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
});
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
const MAX_ALLOWED_FILE_SIZE_MB = 250;
 | 
					const MAX_ALLOWED_FILE_SIZE_MB = 250;
 | 
				
			||||||
const GET = "get",
 | 
					const GET = "get",
 | 
				
			||||||
    PST = "post",
 | 
					    PST = "post",
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user