[Debian-olpc-devel] packaging sugar-etoys-activity

[Ishan Bansal]

Hi

I am updating the sugar-etoys-activity package.
http://git.debian.org/?p=collab-maint/sugar-etoys-activity.git;a=summary

While updating the problem i am facing meging conflict.
http://pastebin.com/A0RNVf0E

Please anyone provide me pointers about what is the correct procedure
followed to solve merging issue.

Regards

Ishan
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-olpc-devel/attachments/20101023/d26d8d50/attachment.htm>