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 /plugins/attachment-reminder | |
| 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 'plugins/attachment-reminder')
| -rw-r--r-- | plugins/attachment-reminder/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am index c13d6bca92..eb7d42fc73 100644 --- a/plugins/attachment-reminder/Makefile.am +++ b/plugins/attachment-reminder/Makefile.am @@ -24,7 +24,7 @@ liborg_gnome_evolution_attachment_reminder_la_LDFLAGS = -module -avoid-version $ liborg_gnome_evolution_attachment_reminder_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/mail/libevolution-module-mail.la \ $(EVOLUTION_MAIL_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) |