merge

1 files changed, 5 insertions, 0 deletions

diff --git a/src/server/ServerUtil.ts b/src/server/ServerUtil.ts
index a10bdd5e6..a63fe5447 100644
--- a/src/server/ServerUtil.ts
+++ b/src/server/ServerUtil.ts
@@ -18,7 +18,11 @@ 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 {
@@ -38,6 +42,7 @@ export class ServerUtils {
             case Types.Boolean: return new BooleanField(json.data, json.id, false);
             case Types.Number: return new NumberField(json.data, json.id, false);
             case Types.Text: return new TextField(json.data, json.id, false);
+            case Types.Icon: return new IconField(json.data, json.id, false);
             case Types.Html: return new HtmlField(json.data, json.id, false);
             case Types.Web: return new WebField(new URL(json.data), json.id, false);
             case Types.RichText: return new RichTextField(json.data, json.id, false);