Fix some merge issues
This commit is contained in:
parent
8b158cfa75
commit
26396ce7db
@ -68,8 +68,8 @@
|
|||||||
"width": 322,
|
"width": 322,
|
||||||
"height": 64
|
"height": 64
|
||||||
}
|
}
|
||||||
|
|
||||||
],
|
],
|
||||||
|
"kill": [],
|
||||||
"win": {
|
"win": {
|
||||||
"x": 12000,
|
"x": 12000,
|
||||||
"y": 0,
|
"y": 0,
|
||||||
|
Reference in New Issue
Block a user