Fix failed rebase

Change-Id: I5d6c6bb50baaa4c1ba986de779bad04ba45947fa Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
sailfishos · Mar 19, 2012 · f3bec84 · f3bec84
1 parent 37bd02a
commit f3bec84
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 0 deletions.
diff --git a/...rative/accessibility/widgets/Checkbox.qml → .../quick/accessibility/content/Checkbox.qml b/...rative/accessibility/widgets/Checkbox.qml → .../quick/accessibility/content/Checkbox.qml
diff --git a/...larative/accessibility/widgets/Slider.qml → ...es/quick/accessibility/content/Slider.qml b/...larative/accessibility/widgets/Slider.qml → ...es/quick/accessibility/content/Slider.qml