[PATCH] 2.4 branch does not build anymore

[Thomas Cataldo]

As conflict marks were committed.


Regards,
Thomas.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.andrew.cmu.edu/pipermail/cyrus-devel/attachments/20130518/78c7699b/attachment.html 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-remove-conflict-marks.patch
Type: application/octet-stream
Size: 1576 bytes
Desc: not available
Url : http://lists.andrew.cmu.edu/pipermail/cyrus-devel/attachments/20130518/78c7699b/attachment.obj