Merge "[Merge conflict resolved] [elm_colorpalette and elm_searchbar]: removal from...

[framework/uifw/elementary.git] / elementary.spec.in

diff --git a/elementary.spec.in b/elementary.spec.in
index 55c25c1..fcc655b 100644 (file)
--- a/elementary.spec.in
+++ b/elementary.spec.in
@@ -94,10 +94,7 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 %{_datadir}/elementary/config/default/*
 %{_datadir}/elementary/config/illume/*
 %{_datadir}/elementary/config/standard/*
-<<<<<<< HEAD
 %{_datadir}/elementary/config/slp/*
-=======
->>>>>>> remotes/origin/upstream
 %{_datadir}/elementary/edje_externals/*
 %{_datadir}/elementary/images/*
 %{_datadir}/elementary/objects/*