From 0e4962bcbc9977ccd2822b04012c62f8155599c7 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期一, 08 七月 2019 11:49:32 +0800
Subject: [PATCH] rm compare scord

---
 es.proto |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/es.proto b/es.proto
index 95dc89f..0f34e99 100644
--- a/es.proto
+++ b/es.proto
@@ -11,11 +11,7 @@
     string personPicUrl =7;
     string phoneNum =8;
     string sex =9;
-<<<<<<< HEAD
-    string idcard = 10;
-=======
     string idCard = 10;
->>>>>>> 8cd3a0511c78f1191b642ccd4fa4b1e1ee14c0a4
     string monitorLevel  = 11;
     string content = 12;
     string picDesc = 13;

--
Gitblit v1.8.0