cha0s/avocado
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: merge

Browse Source
This commit is contained in:
cha0s 2022-04-02 07:57:44 -05:00
parent f3993b82ee
commit d275f4b2d9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/topdown/package.json
View File

@ -45,7 +45,8 @@
"@avocado/traits": "^3.0.0",
"@flecks/core": "^1.4.1",
"@flecks/react": "^1.4.1",
"@flecks/socket": "^1.4.1"
"@flecks/socket": "^1.4.1",
"deepmerge": "^4.2.2"
},
"devDependencies": {
"@flecks/fleck": "^1.4.1"

2
packages/topdown/src/persea/room-sides/entities-side/page.jsx
View File

@ -3,7 +3,6 @@ import {EntityController} from '@avocado/entity/persea';
import {Color} from '@avocado/graphics';
import {useJsonPatcher} from '@avocado/resource/persea';
import {LfoResult} from '@avocado/timing';
import {merge} from '@flecks/core';
import {
classnames,
hot,
@ -13,6 +12,7 @@ import {
usePrevious,
useState,
} from '@flecks/react';
import merge from 'deepmerge';
import locals from './page.module.scss';