[tracker/wip/sam/resource: 5/9] fixup! libtracker-sparql: Initial work on TrackerNamespaceManager

[Sam Thursfield <sthursfield src gnome org>]

commit 12b4b7f5edef3af35a9d095a35d78c90925743f1
Author: Sam Thursfield <sam afuera me uk>
Date:   Fri Apr 8 21:33:38 2016 +0100

    fixup! libtracker-sparql: Initial work on TrackerNamespaceManager

 src/libtracker-sparql/Makefile.am |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/src/libtracker-sparql/Makefile.am b/src/libtracker-sparql/Makefile.am
index 7919a07..e923a78 100644
--- a/src/libtracker-sparql/Makefile.am
+++ b/src/libtracker-sparql/Makefile.am
@@ -52,11 +52,8 @@ tracker-sparql-$(TRACKER_API_VERSION).vapi: tracker-sparql.vapi
 
 libtracker_sparqlinclude_HEADERS =                     \
        $(vala_header)                                 \
-<<<<<<< HEAD
-=======
        tracker-namespace.h                            \
        tracker-namespace-manager.h                    \
->>>>>>> ecf71d8... libtracker-sparql: Initial work on TrackerNamespaceManager
        tracker-ontologies.h \
        tracker-resource.h                             \
        tracker-sparql.h                               \