mirror of
https://github.com/omnivore-app/omnivore.git
synced 2026-03-11 08:54:26 +00:00
Fix conflicts after rebasing
This commit is contained in:
parent
73ce9072f3
commit
f2319bd70d
1 changed files with 0 additions and 3 deletions
|
|
@ -12,14 +12,12 @@ import { User } from '../../src/entity/user'
|
|||
import { Highlight, Page, PageContext } from '../../src/elastic/types'
|
||||
import { getRepository } from '../../src/entity/utils'
|
||||
import { deletePage, getPageById } from '../../src/elastic/pages'
|
||||
import { addLabelInPage } from '../../src/elastic/labels'
|
||||
import { createPubSubClient } from '../../src/datalayer/pubsub'
|
||||
import {
|
||||
addHighlightToPage,
|
||||
getHighlightById,
|
||||
} from '../../src/elastic/highlights'
|
||||
import { refreshIndex } from '../../src/elastic'
|
||||
import { after } from 'mocha'
|
||||
|
||||
describe('Labels API', () => {
|
||||
const username = 'fakeUser'
|
||||
|
|
@ -44,7 +42,6 @@ describe('Labels API', () => {
|
|||
|
||||
after(async () => {
|
||||
// clean up
|
||||
await deletePage(page.id, ctx)
|
||||
await deleteTestUser(username)
|
||||
})
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue