diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-06-27 13:57:02 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-06-27 13:57:02 +0000 |
| commit | 3472067527a6aa66d25a49973e2c3a664c4898a9 (patch) | |
| tree | fe51a425c27c9ebcf86e41ab4f63abb4176101a8 | |
| parent | 3f59be55c0fe991570c5ff061344a4d59e4f50b6 (diff) | |
Resolve conflict in src/Makefile.am: we've removed both tube-dbus-signals-marshal.list and salut-muc-connection-signals-marshal.listCheckpoint_tag_after_merge_of_-publish_-activities_-tubes_branches
| -rw-r--r-- | src/Makefile.am | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index d0b74100..3a457476 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -54,9 +54,7 @@ EXTRA_DIST = \ salut-im-manager-signals-marshal.list \ salut-muc-channel-signals-marshal.list \ salut-muc-manager-signals-marshal.list \ - salut-self-signals-marshal.list \ - salut-muc-connection-signals-marshal.list \ - tube-dbus-signals-marshal.list + salut-self-signals-marshal.list bin_PROGRAMS=telepathy-salut noinst_PROGRAMS = write-mgr-file |