[scim-fcitx/f17] rename conflicted files with fcitx

[Peng Wu]

Summary of changes:

  06518b5... rename conflicted files with fcitx (*)

(*) This commit already existed in another branch; no separate mail sent