Fixed merge error

Change-Id: I90565d7292bbe2fbfea3ed09220bdb001d65c4fe

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index 54676c6..8d8cffb 100644 (file)
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -204,15 +204,11 @@ libdali_adaptor_la_includes = \
                       -I../../../adaptors/integration-api \
                       -I../../../adaptors/public-api/adaptor-framework \
                       -I../../../adaptors/common \
-<<<<<<< HEAD
+                      -I../../../adaptors/base/interfaces \
                       -I../../../adaptors/ \
                       -I../../../text \
                       -I../../../text/dali/internal/libunibreak
 
-=======
-                      -I../../../adaptors/base/interfaces \
-                      -I../../../adaptors/
->>>>>>> origin/tizen
 if WAYLAND
 libdali_adaptor_la_includes += \
                       -I../../../adaptors/wayland \