Fix merge conflicts

This commit is contained in:
Tuan Dang
2023-06-07 12:58:24 +01:00
54 changed files with 4011 additions and 4732 deletions
+1
View File
@@ -43,4 +43,5 @@ export interface BatchSecret {
secretCommentIV: string;
secretCommentTag: string;
tags: string[];
folder: string
}