Resolve merge conflicts

This commit is contained in:
Tuan Dang
2023-01-03 15:59:37 +07:00
42 changed files with 1273 additions and 668 deletions
+1
View File
@@ -16,6 +16,7 @@ declare global {
secretSnapshot: any;
serviceToken: any;
accessToken: any;
serviceTokenData: any;
query?: any;
}
}