Re: [taskcoach-dev] Merge

[Frank Niessink]

2010/8/8 Jérôme Laheurte <fra...@free.fr>:
> WTF ? I tried two times and always got the conflict on task.py...

I think I had a conflict on task.py earlier (Thrusday or Friday) and
resolved it, maybe you need to do a svn update?

Cheers, Frank