[telepathy-glib/f18: 3/3] Fix merge conflicts.

[Brian Pepple]

commit d757c80c2e844d52a7bb6595598c813e84226aef
Merge: ec7c696 c044f92
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Wed Jul 24 09:42:48 2013 -0400

    Fix merge conflicts.

 .gitignore                            |    1 +
 sources                               |    3 +--
 telepathy-glib-broken-pkgconfig.patch |   24 ------------------------
 telepathy-glib.spec                   |    5 ++++-
 4 files changed, 6 insertions(+), 27 deletions(-)
---