src/bin src/edje_external conflict fixed

[framework/uifw/elementary.git] / src / bin / Makefile.am

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index dc83bea..a6aff48 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -33,11 +33,6 @@ elementary_test_SOURCES = \
 test.c \
 test_3d.c \
 test_actionslider.c \
-<<<<<<< HEAD
-test_anchorblock.c \
-test_anchorview.c \
-=======
->>>>>>> remotes/origin/upstream
 test_anim.c \
 test_bg.c \
 test_box.c \
@@ -51,18 +46,12 @@ test_colorselector.c \
 test_conform.c \
 test_ctxpopup.c \
 test_cursor.c \
-<<<<<<< HEAD
-test_diskselector.c \
-test_entry.c \
-test_factory.c \
-=======
 test_datetime.c \
 test_dayselector.c \
 test_diskselector.c \
 test_entry.c \
 test_entry_anchor.c \
 test_entry_anchor2.c \
->>>>>>> remotes/origin/upstream
 test_fileselector_button.c \
 test_fileselector.c \
 test_fileselector_entry.c \
@@ -98,18 +87,11 @@ test_multi.c \
 test_multibuttonentry.c \
 test_naviframe.c \
 test_notify.c \
-<<<<<<< HEAD
-test_pager.c \
-=======
->>>>>>> remotes/origin/upstream
 test_panel.c \
 test_panes.c \
 test_photo.c \
 test_photocam.c \
-<<<<<<< HEAD
-=======
 test_popup.c \
->>>>>>> remotes/origin/upstream
 test_progressbar.c \
 test_radio.c \
 test_scaling.c \
@@ -132,12 +114,8 @@ test_web.c \
 test_win_inline.c \
 test_win_socket.c \
 test_win_plug.c \
-<<<<<<< HEAD
-test_win_state.c
-=======
 test_win_state.c \
 test.h
->>>>>>> remotes/origin/upstream
 
 if HAVE_EIO
 elementary_test_SOURCES += test_eio.c
@@ -193,10 +171,6 @@ elementary_testql_LTLIBRARIES = elementary_testql.la
 elementary_testql_la_SOURCES = $(elementary_test_SOURCES)
 elementary_testql_la_LIBADD = $(top_builddir)/src/lib/libelementary.la \
        @ELEMENTARY_EWEATHER_LIBS@ \
-<<<<<<< HEAD
-       @EIO_LIBS@ \
-       @ELEMENTARY_WEB_LIBS@
-=======
        @ELEMENTARY_EDBUS_LIBS@ \
        @ELEMENTARY_EFREET_LIBS@ \
        @ELEMENTARY_EMAP_LIBS@ \
@@ -204,7 +178,6 @@ elementary_testql_la_LIBADD = $(top_builddir)/src/lib/libelementary.la \
        @EIO_LIBS@ \
        @ELEMENTARY_WEB_LIBS@ \
        @my_libs@
->>>>>>> remotes/origin/upstream
 
 elementary_testql_la_CFLAGS =
 elementary_testql_la_LDFLAGS = -module -avoid-version -no-undefined
@@ -222,9 +195,6 @@ elementary_testql_LDADD = $(top_builddir)/src/lib/libelementary.la \
 elementary_testql_CFLAGS = -DELM_LIB_QUICKLAUNCH=1
 elementary_testql_LDFLAGS =
 endif
-<<<<<<< HEAD
-=======
 
 EXTRA_DIST = \
 test_factory.c
->>>>>>> remotes/origin/upstream