diff options
| author | Fawn <fangrui_tong@brown.edu> | 2019-04-22 17:19:41 -0400 |
|---|---|---|
| committer | Fawn <fangrui_tong@brown.edu> | 2019-04-22 17:19:41 -0400 |
| commit | 227e8443a9fc9ca0c3f2e02e85dbd80b26a8b7b2 (patch) | |
| tree | 285f3387205bc083d4414c5c653df76903edb359 /src/server/ServerUtil.ts | |
| parent | b4e3302949a1997633e55bee5b0ab58757d5a2b0 (diff) | |
merge
Diffstat (limited to 'src/server/ServerUtil.ts')
| -rw-r--r-- | src/server/ServerUtil.ts | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/server/ServerUtil.ts b/src/server/ServerUtil.ts index a63fe5447..eb5749dff 100644 --- a/src/server/ServerUtil.ts +++ b/src/server/ServerUtil.ts @@ -18,11 +18,8 @@ import { NumberField } from "./../fields/NumberField"; import { RichTextField } from "./../fields/RichTextField"; import { TextField } from "./../fields/TextField"; import { Transferable, Types } from "./Message"; -<<<<<<< HEAD import { TemplateField } from "../fields/TemplateField"; -======= import { IconField } from "../fields/IconFIeld"; ->>>>>>> b63bcb791013766d5d16e4f38964499268f904c4 export class ServerUtils { public static prepend(extension: string): string { |