actionslider test application merging conflicts are resolved.
[framework/uifw/elementary.git] / data / images / icon_10.png
data/images/icon_10.png