[nautilus] (3 commits) Non-fast-forward update to branch wip/muktupavels/delete

[Alberts Muktupāvels <muktupavels src gnome org>]

The branch 'wip/muktupavels/delete' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  f873afd... dbus-manager: add and implement FileOperations2 interface
  b2f3ce9... dbus-manager: add DeleteFiles method

Commits added to the branch:

  57f6eee... file-operations: Fix conflict dialog for google-drive (*)
  77a995b... dbus-manager: add and implement FileOperations2 interface
  ba07f61... dbus-manager: add DeleteFiles method

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