Merge branch 'master' of https://github.com/jitcor/tool

# Conflicts: # README.md
xpko · Dec 13, 2024 · fa3383d · fa3383d
2 parents b12001a + 6c1dbf3
commit fa3383d
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 常用工具使用记录&填坑
 ## 目录
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 <!-- DIRECTORY INDEX START -->
 ## 目录索引
@@ -127,6 +128,10 @@
     - [4.1](./Android/android studio/4.1/)
 >>>>>>> 6c1dbf31745b64a48df1a408b50dfad502d08d69
 
+=======
+  - [android studio](./Android/android%20studio/)
+    - [4.1](./Android/android studio/4.1/)
+>>>>>>> 6c1dbf31745b64a48df1a408b50dfad502d08d69