From 5c39670305846ac2abf3e8b7405e57c7511c32ff Mon Sep 17 00:00:00 2001
From: Raul Gutierrez Segales <raul.gutierrez.segales@collabora.co.uk>
Date: Mon, 31 Jan 2011 17:23:00 +0000
Subject: Renamed collaboration as tacollaboration to avoid name clash

---
(limited to 'TurtleArtActivity.py')

diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index 0799283..98968a8 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -49,7 +49,7 @@ from TurtleArt.taexportlogo import save_logo
 from TurtleArt.tautils import data_to_file, data_to_string, data_from_string, \
                               get_path, chooser
 from TurtleArt.tawindow import TurtleArtWindow
-from TurtleArt.collaboration import Collaboration
+from TurtleArt.tacollaboration import Collaboration
 
 
 class TurtleArtActivity(activity.Activity):
--
cgit v0.9.1