fixed merge issue
This commit is contained in:
parent
f85e9a9f45
commit
b92017a0c9
2 changed files with 1 additions and 5 deletions
|
@ -45,7 +45,7 @@ Button {
|
|||
|
||||
control.width = control.size
|
||||
control.height = control.size
|
||||
console.log("Button: size: " + control.size + " height: " + control.height + " width: " + control.width)
|
||||
//console.log("Button: size: " + control.size + " height: " + control.height + " width: " + control.width)
|
||||
}
|
||||
|
||||
background: Item {
|
||||
|
|
|
@ -159,11 +159,7 @@ Page {
|
|||
|
||||
background: Rectangle {
|
||||
radius: 2
|
||||
<<<<<<< HEAD
|
||||
color: classLetterCb.Material.dialogColor//app.style.style.backgroundColor
|
||||
=======
|
||||
color: classLetterCb.Material.dialogColor
|
||||
>>>>>>> origin/master
|
||||
|
||||
layer.enabled: classLetterCb.enabled
|
||||
// layer.effect: ElevationEffect {
|
||||
|
|
Reference in a new issue