Merge Conflict resolved.
[framework/uifw/elementary.git] / data / themes / seg_middle_normal.png
data/themes/seg_middle_normal.png