[tracker/miner-flickr: 19/24] libtracker-client: Fix TrackerClient VAPI binding

[Adrien Bustany <abustany src gnome org>]

commit 1d1f8b5b200991860dcd94c0a36a050f65e15abb
Author: Adrien Bustany <abustany gnome org>
Date:   Fri Mar 26 11:25:15 2010 -0300

    libtracker-client: Fix TrackerClient VAPI binding
    
    This commit sets TrackerClient as subclass of GObject

 src/libtracker-client/tracker-client.vapi |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/src/libtracker-client/tracker-client.vapi b/src/libtracker-client/tracker-client.vapi
index d72335c..7c44980 100644
--- a/src/libtracker-client/tracker-client.vapi
+++ b/src/libtracker-client/tracker-client.vapi
@@ -20,6 +20,7 @@
 [CCode (cprefix = "Tracker", lower_case_cprefix = "tracker_")]
 namespace Tracker {
 	[CCode (cheader_filename = "libtracker-client/tracker-client.h")]
+>>>>>>> libtracker-client: Fix TrackerClient VAPI binding:src/libtracker-client/tracker-client-0.7.vapi
 	public class Client : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public Client (Tracker.ClientFlags flags, int timeout);