[API-NEXT,02/15] merge fix: doc/driver-api-guide/Doxyfile

Message ID 20170127142921.29029-3-maxim.uvarov@linaro.org
State New
Headers show
Series
  • Merge tag 'v1.13.0.0' into api-next
Related show

Commit Message

Maxim Uvarov Jan. 27, 2017, 2:29 p.m.
---
 doc/driver-api-guide/Doxyfile | 10 ----------
 1 file changed, 10 deletions(-)

-- 
2.11.0.295.gd7dffce

Patch

diff --git a/doc/driver-api-guide/Doxyfile b/doc/driver-api-guide/Doxyfile
index e3d3f920..b5f7260e 100644
--- a/doc/driver-api-guide/Doxyfile
+++ b/doc/driver-api-guide/Doxyfile
@@ -5,7 +5,6 @@  PROJECT_NUMBER = $(VERSION)
 PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.svg
 INPUT = $(SRCDIR)/doc/driver-api-guide \
 	$(SRCDIR)/include/odp/drv \
-<<<<<<< HEAD
 	$(SRCDIR)/platform/$(WITH_PLATFORM)/include/odp/drv \
 	$(SRCDIR)/include/odp_drv.h
 PREDEFINED = __GNUC__ \
@@ -16,12 +15,3 @@  PREDEFINED = __GNUC__ \
 	     __x86_64__ \
 	     ODPDRV_PACKED \
 	     "ODPDRV_HANDLE_T(type)=odpdrv_handle_t type"
-=======
-	$(SRCDIR)/include/odp_drv.h
-EXCLUDE_PATTERNS = drv* odp_drv.h
-EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR)
-PREDEFINED = __GNUC__ \
-	     "ODP_HANDLE_T(type)=odp_handle_t type" \
-	     odpdrv_bool_t=int
-WARNINGS = NO
->>>>>>> v1.13.0.0