ehm
commitc5e34993e9df5499510be1f97097744dff6dc058
authorAndrea Cimitan <andrea.cimitan@gmail.com>
dateMon 24 Aug 2015, 16:14 (11 years ago)
parent1409211
qml/Launcher/LauncherDelegate.qml−3
@@ -206,8 +206,6 @@ Item {
206206 }
207207 }
208208
209−<<<<<<< TREE
210−=======
211209 Image {
212210 objectName: "runningHighlight"
213211 anchors {
@@ -219,7 +217,6 @@ Item {
219217 source: "graphics/focused_app_arrow.png"
220218 }
221219
222−>>>>>>> MERGE-SOURCE
223220 Image {
224221 objectName: "focusedHighlight"
225222 anchors {