diff options
| author | Sam Wilkins <abdullah_ahmed@brown.edu> | 2019-04-13 19:11:49 -0400 |
|---|---|---|
| committer | Sam Wilkins <abdullah_ahmed@brown.edu> | 2019-04-13 19:11:49 -0400 |
| commit | 35f09470b2939a6640b85c94a9a4ea2551a6ea42 (patch) | |
| tree | 5beb6aaaa2198d28d30bce288f9041398d6d4f84 /src/fields/KeyStore.ts | |
| parent | 8c58ff299e371c70147aa8123ed9fb0ae1a9e880 (diff) | |
| parent | c392a9322c1df269cfd823dd82d07d991fe065c0 (diff) | |
resolved merge conflicts
Diffstat (limited to 'src/fields/KeyStore.ts')
| -rw-r--r-- | src/fields/KeyStore.ts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/fields/KeyStore.ts b/src/fields/KeyStore.ts index 425408273..da2d7268f 100644 --- a/src/fields/KeyStore.ts +++ b/src/fields/KeyStore.ts @@ -1,5 +1,4 @@ import { Key } from "./Key"; -import { KeyTransfer } from "../server/Message"; export namespace KeyStore { export const Prototype = new Key("Prototype"); |