2 Commits

Author	SHA1	Message	Date
royqh1979@gmail.com	049df39411	add icons for conflict	2022-02-21 11:37:29 +08:00
royqh1979@gmail.com	56d8616a5f	fix: error in icons ... fix: icons in files view not changed, when icon set is changed work save: git merge and branch	2022-02-21 09:48:04 +08:00