<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-12-14 14:55:29 +0100 (Fri, 14 Dec 2012)</td></tr>
<tr><td>New Revision: </td><td>4795</td></tr>
</table>
<hr/><b>Log:</b><div style='padding-left: 20px; color:black'>
Fixing delta merge problem (MID-1054)<br/>
<br/>
</div><hr/>
<b>Modified:</b><div style='padding-left: 20px; color:blue'>
trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java?r2=4795&r1=4794"><see></a><br/>
trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java?r2=4795&r1=4794"><see></a><br/>
trunk/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java <a href="http://fisheye.evolveum.com/browse/MidPoint/trunk/infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java?r2=4795&r1=4794"><see></a><br/>
</div>
</body></html>