[aerogear-issues] [JBoss JIRA] (AGIOS-267) DiffMatchPatch conflict resolver

[Corinne Krych (JIRA)]

An HTML attachment was scrubbed...
URL: http://lists.jboss.org/pipermail/aerogear-issues/attachments/20140919/26b74e92/attachment.html 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: image/png
Size: 1084 bytes
Desc: not available
Url : http://lists.jboss.org/pipermail/aerogear-issues/attachments/20140919/26b74e92/attachment.png 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: image/png
Size: 2983 bytes
Desc: not available
Url : http://lists.jboss.org/pipermail/aerogear-issues/attachments/20140919/26b74e92/attachment-0001.png 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: image/png
Size: 1058 bytes
Desc: not available
Url : http://lists.jboss.org/pipermail/aerogear-issues/attachments/20140919/26b74e92/attachment-0002.png