diff options
-rwxr-xr-x | NOTICE.Flora | 3 | ||||
-rwxr-xr-x | packaging/org.tizen.smartsearch.spec | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/NOTICE.Flora b/NOTICE.Flora index ffacf89..eeb9180 100755 --- a/NOTICE.Flora +++ b/NOTICE.Flora @@ -1,5 +1,8 @@ Copyright (c) Samsung Electronics Co., Ltd. All rights reserved. Except as noted, this software is licensed under Flora License, Version 1. Please, see the LICENSE file for Flora License terms and conditions. +<<<<<<< HEAD +======= +>>>>>>> master diff --git a/packaging/org.tizen.smartsearch.spec b/packaging/org.tizen.smartsearch.spec index 826d5a4..d50d758 100755 --- a/packaging/org.tizen.smartsearch.spec +++ b/packaging/org.tizen.smartsearch.spec @@ -39,7 +39,7 @@ BuildRequires: cmake BuildRequires: edje-tools BuildRequires: gettext-devel -Requires: libug-worldclock-efl libug-phone-efl org.tizen.browser +Requires: libug-worldclock-efl libug-phone-efl %description Smartsearch Application. |