Merge Conflict resolved.
[framework/uifw/elementary.git] / data / objects / cross.png
data/objects/cross.png