<html>
<head>
</head>
<body>
<table border='0' cellpadding='3'>
<tr><td>Author: </td><td><b>semancik</b></td></tr>
<tr><td>Date:</td><td>2012-10-03 10:34:59 +0200 (Wed, 03 Oct 2012)</td></tr>
<tr><td>New Revision: </td><td>4255</td></tr>
</table>
<hr/><b>Log:</b><div style='padding-left: 20px; color:black'>
Cleaning up forgotten conflict marks<br/>
<br/>
</div><hr/>
<b>Modified:</b><div style='padding-left: 20px; color:blue'>
trunk/samples/resources/opendj/opendj-localhost-resource-sync-advanced.xml <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/samples/resources/opendj/opendj-localhost-resource-sync-advanced.xml?r2=4255&r1=4254"><see></a><br/>
</div>
</body></html>