merge sdk path.

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