git.iko.soy/unity8
on xenial help sign in
fix bad merge
f4ac106Michael Zanetti
qml/Dash/GenericScopeView.qml−4
compare with xenial
unifiedsplit
@@ -215,10 +215,6 @@ FocusScope {
215 delegate: DashCategoryBase {
215 delegate: DashCategoryBase {
216 id: baseItem
216 id: baseItem
217 objectName: "dashCategory" + category
217 objectName: "dashCategory" + category
218−<<<<<<< TREE
219− showDivider: false
220−=======
221−>>>>>>> MERGE-SOURCE
222
218
223 property Item seeAllButton: seeAll
219 property Item seeAllButton: seeAll
224
220