Skip to content

Commit

Permalink
Fix minor merge conflict issues
Browse files Browse the repository at this point in the history
  • Loading branch information
EvanHahn committed Aug 26, 2024
1 parent 3a494aa commit e950e79
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/core-manager/core-index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import crypto from 'hypercore-crypto'
/** @import { Namespace } from '../types.js' */
/** @typedef {import('./index.js').CoreRecord} CoreRecord */
/** @import { CoreRecord } from './index.js' */

/**
* An in-memory index of open cores.
Expand Down
2 changes: 1 addition & 1 deletion src/core-manager/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const WRITER_CORE_PREHAVES_DEBOUNCE_DELAY = 1000

export const kCoreManagerReplicate = Symbol('replicate core manager')

/** @typedef {import('hypercore')<'binary', Buffer>} Core */
/** @typedef {Hypercore<'binary', Buffer>} Core */
/** @typedef {{ core: Core, key: Buffer, namespace: Namespace }} CoreRecord */
/**
* @typedef {Object} Events
Expand Down
2 changes: 1 addition & 1 deletion src/sync/peer-sync-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { ExhaustivenessError, createMap } from '../utils.js'
/** @import { Namespace } from '../types.js' */

/**
* @typedef {import('../roles.js').Role['sync'][Namespace] | 'unknown'} SyncCapability
* @typedef {Role['sync'][Namespace] | 'unknown'} SyncCapability
*/

/** @type {Namespace[]} */
Expand Down

0 comments on commit e950e79

Please sign in to comment.