Skip to content

Commit a09afac

Browse files
committed
fix: resolve cherry-pick conflict for #304 — keep CONFIG_PARAMS/envMngr imports, StructonEncoder already in HEAD
1 parent ba41ee0 commit a09afac

1 file changed

Lines changed: 0 additions & 5 deletions

File tree

resources/RecordEncoder.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,8 @@ import { getThisNodeId } from './nodeIdMapping.ts';
2929
import { recordAction } from './analytics/write.ts';
3030
import { RocksDatabase } from '@harperfast/rocksdb-js';
3131
import { when } from '../utility/when.ts';
32-
<<<<<<< HEAD
33-
=======
3432
import { CONFIG_PARAMS } from '../utility/hdbTerms.ts';
3533
import * as envMngr from '../utility/environment/environmentManager.js';
36-
37-
const StructonEncoder = createStructon(Encoder) as typeof Encoder;
38-
>>>>>>> f79e35fe5 (Merge pull request #304 from HarperFast/read_txn_expiration)
3934
export type Entry = {
4035
key: any;
4136
value: any;

0 commit comments

Comments
 (0)