[genlist, gen, gen_common] merge upstream except for elm_genlist.c

[framework/uifw/elementary.git] / data / images / Makefile.am

diff --git a/data/images/Makefile.am b/data/images/Makefile.am
index 0afa857..41838c2 100644 (file)
--- a/data/images/Makefile.am
+++ b/data/images/Makefile.am
@@ -47,9 +47,12 @@ icon_23.png \
 icon_right_arrow.png \
 bubble.png \
 bubble_sh.png \
+<<<<<<< HEAD
 copy&paste_icon_clipboard.png \
 copy&paste_icon_search.png \
 copy&paste_icon_share.png \
+=======
+>>>>>>> remotes/origin/upstream
 mystrale.jpg \
 mystrale_2.jpg \
 twofish.jpg \