Changes
* Solve the conflict according the Timestamp information: the newest change wins agains the older one.
* Manual solve: mark the object and let the user solve the “problem”
==See also==
* [[Proxy]]
* [[MetaProxy]]
* [[ProxyMetaProperty]]
