Merge Conflict resolved.
[framework/uifw/elementary.git] / data / objects / sky.jpg
data/objects/sky.jpg Reading blob failed.