diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-04-25 22:16:00 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-04-25 22:16:00 +0800 |
| commit | faf1c14c11f3e6026f786e9587715c10b13c723e (patch) | |
| tree | 3dbf5816532cbea2510b4438c7c40d91fc426d3a /mail/em-utils.c | |
| parent | 86fdd3a1cba7c156cfa127322e258f5636b45a99 (diff) | |
| download | gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.gz gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.bz2 gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.lz gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.xz gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.tar.zst gsoc2013-evolution-faf1c14c11f3e6026f786e9587715c10b13c723e.zip | |
Manual conflict resolution
Diffstat (limited to 'mail/em-utils.c')
| -rw-r--r-- | mail/em-utils.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mail/em-utils.c b/mail/em-utils.c index 7e110877fa..2da8efaad2 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -2086,7 +2086,6 @@ is_local (ESourceGroup *group) return group && e_source_group_peek_base_uri (group) && g_str_has_prefix (e_source_group_peek_base_uri (group), "file://"); ->>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:mail/em-utils.c } gboolean |