Fix merge conflicts

This commit is contained in:
Tuan Dang
2023-01-04 21:31:58 +07:00
41 changed files with 380 additions and 220 deletions
+1
View File
@@ -17,6 +17,7 @@ declare global {
serviceToken: any;
accessToken: any;
serviceTokenData: any;
apiKeyData: any;
query?: any;
}
}