From b4912454b001d3287932463b9119dcdfb68e8ba4 Mon Sep 17 00:00:00 2001
From: lss <316519258@qq.com>
Date: 星期三, 10 六月 2020 15:54:02 +0800
Subject: [PATCH] Merge branch 'lss' of http://172.16.1.23:6688/r/~xm/HomeApp into lss

---
 ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
index 0b84d58..447e1cb 100644
--- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
+++ b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
@@ -2,7 +2,6 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.

--
Gitblit v1.8.0