fix the conflict
authorColtMa <mumchristmas@gmail.com>
Tue, 8 Jun 2021 02:54:42 +0000 (10:54 +0800)
committerColtMa <mumchristmas@gmail.com>
Tue, 8 Jun 2021 02:54:42 +0000 (10:54 +0800)
commit769b75357d17981045dc5bd9168a1a6cfe2286c0
treed66a1ab37e5f6f3a10c94fa233d41d7b460e322a
parentd9b8d9c0176e12bbf33dde687855b7eea0c89ed7
fix the conflict
IDS-UCS-Basic.txt