From 3abe5bea435d4a38399693b17b37b5e445ff7445 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 21 八月 2019 19:49:53 +0800
Subject: [PATCH] merge
---
sysset.pb.go | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/sysset.pb.go b/sysset.pb.go
index 7863fb1..bad117a 100644
--- a/sysset.pb.go
+++ b/sysset.pb.go
@@ -464,8 +464,6 @@
0xd7, 0xaa, 0xc4, 0x65, 0x9f, 0x96, 0xfd, 0xf2, 0x27, 0x00, 0x00, 0xff, 0xff, 0x1c, 0xcb, 0xf3,
0x28, 0x7e, 0x04, 0x00, 0x00,
}
-<<<<<<< HEAD
-=======
func (m *PollConfig) MarshalTo(dAtA []byte) (int, error) {
var i int
@@ -2056,4 +2054,3 @@
ErrInvalidLengthSysset = fmt.Errorf("proto: negative length found during unmarshaling")
ErrIntOverflowSysset = fmt.Errorf("proto: integer overflow")
)
->>>>>>> 307d7f825aedebd6e6e5d705c5193c3d1e5116e6
--
Gitblit v1.8.0