Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
03b1de6925
1 changed files with 1 additions and 1 deletions
|
@ -34,7 +34,6 @@
|
||||||
{"label":"6,3", "x":10.5, "y":1},
|
{"label":"6,3", "x":10.5, "y":1},
|
||||||
{"label":"6,4", "x":11.5, "y":1},
|
{"label":"6,4", "x":11.5, "y":1},
|
||||||
{"label":"6,5", "x":12.5, "y":1},
|
{"label":"6,5", "x":12.5, "y":1},
|
||||||
{"label":"7,6", "x":13.75, "y":1, "w":1.25, "h":2},
|
|
||||||
{"label":"6,7", "x":15, "y":1},
|
{"label":"6,7", "x":15, "y":1},
|
||||||
{"label":"2,0", "x":0, "y":2, "w":1.75},
|
{"label":"2,0", "x":0, "y":2, "w":1.75},
|
||||||
{"label":"2,1", "x":1.75, "y":2},
|
{"label":"2,1", "x":1.75, "y":2},
|
||||||
|
@ -49,6 +48,7 @@
|
||||||
{"label":"7,3", "x":10.75, "y":2},
|
{"label":"7,3", "x":10.75, "y":2},
|
||||||
{"label":"7,4", "x":11.75, "y":2},
|
{"label":"7,4", "x":11.75, "y":2},
|
||||||
{"label":"7,5", "x":12.75, "y":2},
|
{"label":"7,5", "x":12.75, "y":2},
|
||||||
|
{"label":"7,6", "x":13.75, "y":1, "w":1.25, "h":2},
|
||||||
{"label":"7,7", "x":15, "y":2},
|
{"label":"7,7", "x":15, "y":2},
|
||||||
{"label":"3,0", "x":0, "y":3, "w":2.25},
|
{"label":"3,0", "x":0, "y":3, "w":2.25},
|
||||||
{"label":"3,1", "x":2.25, "y":3},
|
{"label":"3,1", "x":2.25, "y":3},
|
||||||
|
|
Loading…
Reference in a new issue