From 4152e237c37062c1adc685db47702b88a3d95f0a Mon Sep 17 00:00:00 2001
From: liwen <lwdillon@163.com>
Date: Thu, 14 Jan 2021 16:59:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0websocket,=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 falsework-client/src/test/java/TableViewSample.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/falsework-client/src/test/java/TableViewSample.java b/falsework-client/src/test/java/TableViewSample.java
index 19fce04..07ded51 100644
--- a/falsework-client/src/test/java/TableViewSample.java
+++ b/falsework-client/src/test/java/TableViewSample.java
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
-import com.fx.server.vo.UserVO;
-=======
->>>>>>> 6fa352c50bee89ed3f768a2360e651f447f94c96
+
 import javafx.application.Application;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ListProperty;