From: TrillGates <williamtrillgates@gmail.com>
Date: Wed, 30 Jun 2021 04:08:08 +0000 (+0800)
Subject: merge sdk path.
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=fa8670972792327c0bfaacc8caa5722676fa3a3e;p=protocol_srv.git

merge sdk path.
---

diff --git a/local.properties b/local.properties
index 3fde303d..f3b2061f 100644
--- a/local.properties
+++ b/local.properties
@@ -5,7 +5,4 @@
 # For customization when using a Version Control System, please read the
 # header note.
 #Tue Jun 29 20:13:18 CST 2021
->>>>>>>=bac6231c4f7e5884c23cfac5feb384cddb497355
 sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk
-=\=\=\=\=\=\=
-<<<<<<<=HEAD