chore: Resolve merge conflicts
This commit is contained in:
@@ -44,7 +44,7 @@
|
||||
"ant-design-vue": "^4.2.3",
|
||||
"dayjs": "^1.11.12",
|
||||
"pinia": "2.1.7",
|
||||
"vue": "^3.4.34",
|
||||
"vue": "^3.4.35",
|
||||
"vue-router": "^4.4.0"
|
||||
}
|
||||
}
|
||||
|
@@ -21,7 +21,7 @@
|
||||
(function () {
|
||||
var hm = document.createElement('script');
|
||||
hm.src =
|
||||
'https://hm.baidu.com/hm.js?d20a01273820422b6aa2ee41b6c9414d';
|
||||
'https://hm.baidu.com/hm.js?24bb3eb91dfe4ebfcbcee6952a107cb6';
|
||||
var s = document.getElementsByTagName('script')[0];
|
||||
s.parentNode.insertBefore(hm, s);
|
||||
})();
|
||||
|
@@ -43,7 +43,7 @@
|
||||
"@vueuse/core": "^10.11.0",
|
||||
"naive-ui": "^2.39.0",
|
||||
"pinia": "2.1.7",
|
||||
"vue": "^3.4.34",
|
||||
"vue": "^3.4.35",
|
||||
"vue-router": "^4.4.0"
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user