commit after resolve merge conflit

This commit is contained in:
Eudes Inácio
2023-03-10 09:05:33 +01:00
parent 05d8bf424e
commit 889e382905
14 changed files with 19 additions and 22 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
// import { models } from 'beast-orm'
import { models } from 'src/plugin/src'
import { models } from 'beast-orm'
/* import { models } from 'src/plugin/src' */
import { environment } from 'src/environments/environment'
const { ArrayField, JsonField} = models.indexedDB.fields