diff options
| author | Ronan Le Martret <ronan@fridu.net> | 2014-03-10 16:27:02 +0100 |
|---|---|---|
| committer | Sabera Djelti (sdi2) <sabera.djelti@open.eurogiciel.org> | 2014-03-24 14:38:47 +0100 |
| commit | 9f0d04b0cf5e56af7d5c06caaf06adb15151d73b (patch) | |
| tree | 17e45255791c347411ffa0222c93f0d39764045d | |
| parent | 7c4c0ba619f9c97321fe027f12e94f0989b8d5c1 (diff) | |
| download | email-service-9f0d04b0cf5e56af7d5c06caaf06adb15151d73b.tar.gz email-service-9f0d04b0cf5e56af7d5c06caaf06adb15151d73b.tar.bz2 email-service-9f0d04b0cf5e56af7d5c06caaf06adb15151d73b.zip | |
Remove merge conflict
Change-Id: I2be479e41da03e5cbac2fd5f6ccc95b640564289
Signed-off-by: Ronan Le Martret <ronan@fridu.net>
| -rwxr-xr-x | packaging/email-service.spec | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/packaging/email-service.spec b/packaging/email-service.spec index 28e58bb..5a2fc04 100755 --- a/packaging/email-service.spec +++ b/packaging/email-service.spec @@ -120,21 +120,12 @@ vconftool set -t int db/private/email-service/default_account_id "0" -g 6514 # for default account id vconftool set -t int memory/sync/email "0" -i -g 6514 -s "email::vconf_sync_status" -<<<<<<< HEAD -# for priority send +# for priority send vconftool set -t string db/private/email-service/noti_ringtone_path "/opt/usr/share/settings/Alerts/Over the horizon.mp3" -g 6514 -s "email::vconf_ringtone_path" vconftool set -t int db/private/email-service/noti_rep_type "0" -g 6514 -s "email::vconf_rep_type" vconftool set -t bool db/private/email-service/noti_notification_ticker "0" -g 6514 -s "email::vconf_notification" vconftool set -t bool db/private/email-service/noti_display_content_ticker "0" -g 6514 -s "email::vconf_display_content" vconftool set -t bool db/private/email-service/noti_badge_ticker "0" -i -g 6514 -s "email::vconf_bagdge" -======= -# for priority send -vconftool set -t string db/private/email-service/noti_ringtone_path "Whistle.mp3" -g 6514 -vconftool set -t int db/private/email-service/noti_rep_type "0" -g 6514 -vconftool set -t bool db/private/email-service/noti_notification_ticker "0" -g 6514 -vconftool set -t bool db/private/email-service/noti_display_content_ticker "0" -g 6514 -vconftool set -t bool db/private/email-service/noti_badge_ticker "0" -i -g 6514 ->>>>>>> 61cf8bf... Allow install of email-service without webkit2. vconftool set -t int db/private/email-service/noti_private_id/1 "0" -i -g 6514 vconftool set -t int db/private/email-service/noti_private_id/2 "0" -i -g 6514 vconftool set -t int db/private/email-service/noti_private_id/3 "0" -i -g 6514 |