Resolve merge conflict

游雁

2024-01-14 8912e0696af069de47646fdb8a9d9c4e086e88b3

1
2
3
4
5
6
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
   uuid = "A434E096-73C6-4C03-86F5-FAA8A72D79B0"
   type = "1"
   version = "2.0">
</Bucket>