[nautilus-sendto: 6/6] Fix merge conflicts

[Brian Pepple]

commit 4ff5296cc91e71f6fc9a47bb6819830e1f5f906c
Merge: 3032f0d ed6f942
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Tue Sep 6 20:28:56 2011 -0400

    Fix merge conflicts

 nautilus-sendto.spec |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---