Fix some merge issues

This commit is contained in:
Evan Pratten 2021-10-04 14:50:55 -04:00
parent 8b158cfa75
commit 26396ce7db

View File

@ -68,8 +68,8 @@
"width": 322, "width": 322,
"height": 64 "height": 64
} }
], ],
"kill": [],
"win": { "win": {
"x": 12000, "x": 12000,
"y": 0, "y": 0,