core/merge: Remove unused resolveNoteConflict()
core/merge: Remove unused resolveNoteConflict()

  Since `cozy-note` files' content is now re-imported by `cozy-stack` when
  uploaded, we don't need a conflict generation method specific to this
  file type (i.e. conflicts were always created on the remote Cozy for
  notes so their content would not be lost).

cozy-labs/cozy-desktop,cozy-labs/cozy-desktop,cozy-labs/cozy-desktop,cozy-labs/cozy-desktop