lqq 0582609ba6 解决冲突git %!s(int64=8) %!d(string=hai) anos
..
BaseConfig.pas 6d9d9ab5cd Signed-off-by: lqq <lqq@wswin.cn> %!s(int64=9) %!d(string=hai) anos
Config.dpr 6d9d9ab5cd Signed-off-by: lqq <lqq@wswin.cn> %!s(int64=9) %!d(string=hai) anos
Config.dproj 6d9d9ab5cd Signed-off-by: lqq <lqq@wswin.cn> %!s(int64=9) %!d(string=hai) anos
UIViewConfig.pas 6d9d9ab5cd Signed-off-by: lqq <lqq@wswin.cn> %!s(int64=9) %!d(string=hai) anos