Fix merge d04108b32fbec162e14b330b140beca12ddb3b33
Fix merge d04108b32fbec162e14b330b140beca12ddb3b33

Sót 1 file <(_ _)>

gakada/KanColleViewer,KatoriKai/KanColleViewer,heartfelt-fancy/KanColleViewer,BossaGroove/KanColleViewer,AnnaKutou/KanColleViewer,yuyuvn/KanColleViewer,bllue78/KanColleViewer,Astrologers/KanColleViewer,gakada/KanColleViewer,kookxiang/KanColleViewer,gakada/KanColleViewer