update conflict

2026-03-08 14:05:59 +07:00
parent dd4238b3a6
commit 699857e085
1 changed files with 0 additions and 4 deletions
--- a/src/lib/helpers.ts
+++ b/src/lib/helpers.ts
@ -59,7 +59,3 @@ export function uniqueID(): string {

 const baseUrl = import.meta.env?.VITE_BASE_URL || '/';
 export const TEMPLATE_CSV_URL = `${baseUrl}template_notification.csv`;
-<<<<<<< HEAD
-=======
-
->>>>>>> 10532a7cb1d720488c181b1fcac3b8046c888e77