fix bad merge
commitf4ac106bfb12352d3ac118e363fc870a785f5045
authorMichael Zanetti <michael.zanetti@canonical.com>
dateWed 15 Oct 2014, 10:16 (12 years ago)
parentc8adabc
qml/Dash/GenericScopeView.qml−4
@@ -215,10 +215,6 @@ FocusScope {
215215 delegate: DashCategoryBase {
216216 id: baseItem
217217 objectName: "dashCategory" + category
218−<<<<<<< TREE
219− showDivider: false
220−=======
221−>>>>>>> MERGE-SOURCE
222218
223219 property Item seeAllButton: seeAll
224220