From f3c199b3ce1797b1d22de87f32ec19f2060edeb2 Mon Sep 17 00:00:00 2001
From: Tats <info@sofianaudry.com>
Date: Thu, 17 Sep 2015 09:12:43 -0400
Subject: [PATCH] Resolved conflict

---
 mapmap.pro | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mapmap.pro b/mapmap.pro
index 485cb59..8cfe63a 100644
--- a/mapmap.pro
+++ b/mapmap.pro
@@ -72,6 +72,7 @@ QMAKE_EXTRA_TARGETS += docs
 unix:!mac {
   DEFINES += UNIX
   CONFIG += link_pkgconfig
+  INCLUDE_PATH += 
   PKGCONFIG += \
     gstreamer-1.0 gstreamer-base-1.0 gstreamer-app-1.0 \
     liblo \