ymao 4 years ago
parent
commit
bf7d54e067
2 changed files with 31 additions and 29 deletions
  1. 26 28
      .gitignore
  2. 5 1
      README.md

+ 26 - 28
.gitignore

@@ -1,31 +1,29 @@
-# ---> macOS
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-# ---> Python
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

+ 5 - 1
README.md

@@ -1,3 +1,7 @@
 # wxlogin
 
-微信pc和移动端登录相关工具包
+微信pc和移动端登录相关工具包
+=======
+# trops_wxlogin
+
+>>>>>>> d61017fc1afe3cee792f73cd5165090828ab31ab