git.iko.soy/unity8
on xenial help sign in
ehm
c5e3499Andrea Cimitan
qml/Launcher/LauncherDelegate.qml−3
compare with xenial
unifiedsplit
@@ -206,8 +206,6 @@ Item {
206 }
206 }
207 }
207 }
208
208
209−<<<<<<< TREE
210−=======
211 Image {
209 Image {
212 objectName: "runningHighlight"
210 objectName: "runningHighlight"
213 anchors {
211 anchors {
@@ -219,7 +217,6 @@ Item {
219 source: "graphics/focused_app_arrow.png"
217 source: "graphics/focused_app_arrow.png"
220 }
218 }
221
219
222−>>>>>>> MERGE-SOURCE
223 Image {
220 Image {
224 objectName: "focusedHighlight"
221 objectName: "focusedHighlight"
225 anchors {
222 anchors {