fixed plugin image size problem

[framework/uifw/elementary.git] / config / Makefile.am

diff --git a/config/Makefile.am b/config/Makefile.am
index a1ce163..36b403f 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,9 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
-<<<<<<< HEAD
-SUBDIRS = default standard illume slp
-=======
-SUBDIRS = default standard illume
->>>>>>> remotes/origin/upstream
+SUBDIRS = default standard illume mobile desktop
 
 EET_EET = @eet_eet@