From dce5f3ea01d8c26cedf1d72fda33db52e8e57f47 Mon Sep 17 00:00:00 2001
From: Ian Elliott <ianelliott@google.com>
Date: Wed, 18 Nov 2015 15:32:38 -0700
Subject: nulldrv: Get compiling.

Conflicts:
	icd/common/icd.h
---
 icd/common/icd.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'icd/common')

diff --git a/icd/common/icd.h b/icd/common/icd.h
index 20726d93..eb371c79 100644
--- a/icd/common/icd.h
+++ b/icd/common/icd.h
@@ -33,10 +33,14 @@
 
 #include <vulkan/vulkan.h>
 #include <vulkan/vk_platform.h>
+<<<<<<< HEAD
 #include <vulkan/vk_lunarg_debug_report.h>
 #include "vulkan/VK_KHR_surface.h"
 #include "vulkan/VK_KHR_swapchain.h"
 
+=======
+#include <vulkan/vk_debug_report_lunarg.h>
+>>>>>>> 1379888... nulldrv: Get compiling.
 #include "vulkan/vk_sdk_platform.h"
 
 #if defined(__GNUC__) && __GNUC__ >= 4
-- 
cgit v1.2.3