[Telepathy-commits] [telepathy-gabble/master] fix conflict with HEAD

[Guillaume Desmottes]

20080807130407-7fe3f-42b0663488138536316071612fb52bfc413fc6b3.gz
---
 tests/twisted/Makefile.am |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 9dae343..0157df7 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -11,6 +11,14 @@ TWISTED_TESTS = \
 	olpc/olpc-muc-prop-change.py \
 	olpc/test-olpc-bundle.py \
 	olpc/test-olpc-set-props-preload.py \
+	olpc/change-notifications.py \
+	olpc/olpc-buddy-search.py \
+	olpc/gadget-invite.py \
+	olpc/gadget-publish.py \
+	olpc/gadget-restarted.py \
+	presence/presence.py \
+	roster/groups.py \
+	roster/groups-12791.py \
 	roster/test-google-roster.py \
 	roster/test-roster.py \
 	roster/test-roster-subscribe.py \
-- 
1.5.6.5