From 227e8443a9fc9ca0c3f2e02e85dbd80b26a8b7b2 Mon Sep 17 00:00:00 2001
From: Fawn <fangrui_tong@brown.edu>
Date: Mon, 22 Apr 2019 17:19:41 -0400
Subject: merge

---
 src/server/ServerUtil.ts | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/server/ServerUtil.ts')

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 {
-- 
cgit v1.2.3-70-g09d2