Merge branch 'master' of https://github.com/ZzzM/HostsToolforMac

# Conflicts: # README.md
ZzzM · Apr 1, 2019 · de6c7fa · de6c7fa
2 parents 147a122 + 9d3602c
commit de6c7fa
Show file tree

Hide file tree

Showing 171 changed files with 3,274 additions and 2,913 deletions.
diff --git a/README.md b/README.md
@@ -10,6 +10,7 @@
 ### Version 2.3.2：
 -更新至 Swift 5<br/>
 
+
 #### 网络更新机制：
 -第一次更新会完全覆盖原hosts，然后生成“# My Hosts Start”、“# My Hosts End”标识<br/>
 -需要添加的话，只要在“# My Hosts Start”、“# My Hosts End”范围内编辑，

diff --git a/Source Code/HostsToolForMac/Carthage/Build/Mac/RxAtomic.framework.dSYM/Contents/Info.plist b/Source Code/HostsToolForMac/Carthage/Build/Mac/RxAtomic.framework.dSYM/Contents/Info.plist
diff --git a/...tsToolForMac/Carthage/Build/Mac/RxAtomic.framework.dSYM/Contents/Resources/DWARF/RxAtomic b/...tsToolForMac/Carthage/Build/Mac/RxAtomic.framework.dSYM/Contents/Resources/DWARF/RxAtomic
diff --git a/Source Code/HostsToolForMac/Carthage/Build/Mac/RxAtomic.framework/Headers b/Source Code/HostsToolForMac/Carthage/Build/Mac/RxAtomic.framework/Headers
diff --git a/Source Code/HostsToolForMac/Carthage/Build/Mac/RxAtomic.framework/Modules b/Source Code/HostsToolForMac/Carthage/Build/Mac/RxAtomic.framework/Modules
diff --git a/Source Code/HostsToolForMac/Carthage/Build/Mac/RxAtomic.framework/Resources b/Source Code/HostsToolForMac/Carthage/Build/Mac/RxAtomic.framework/Resources
diff --git a/Source Code/HostsToolForMac/Carthage/Build/Mac/RxAtomic.framework/RxAtomic b/Source Code/HostsToolForMac/Carthage/Build/Mac/RxAtomic.framework/RxAtomic
diff --git a/... Code/HostsToolForMac/Carthage/Build/Mac/RxAtomic.framework/Versions/A/Headers/RxAtomic.h b/... Code/HostsToolForMac/Carthage/Build/Mac/RxAtomic.framework/Versions/A/Headers/RxAtomic.h
diff --git a/...HostsToolForMac/Carthage/Build/Mac/RxAtomic.framework/Versions/A/Modules/module.modulemap b/...HostsToolForMac/Carthage/Build/Mac/RxAtomic.framework/Versions/A/Modules/module.modulemap
diff --git a/...ode/HostsToolForMac/Carthage/Build/Mac/RxAtomic.framework/Versions/A/Resources/Info.plist b/...ode/HostsToolForMac/Carthage/Build/Mac/RxAtomic.framework/Versions/A/Resources/Info.plist
diff --git a/Source Code/HostsToolForMac/Carthage/Build/Mac/RxAtomic.framework/Versions/A/RxAtomic b/Source Code/HostsToolForMac/Carthage/Build/Mac/RxAtomic.framework/Versions/A/RxAtomic
diff --git a/Source Code/HostsToolForMac/Carthage/Build/Mac/RxAtomic.framework/Versions/Current b/Source Code/HostsToolForMac/Carthage/Build/Mac/RxAtomic.framework/Versions/Current
diff --git a/... Code/HostsToolForMac/Carthage/Build/iOS/D780457F-DFD1-3FAF-9901-8C818FA716F1.bcsymbolmap b/... Code/HostsToolForMac/Carthage/Build/iOS/D780457F-DFD1-3FAF-9901-8C818FA716F1.bcsymbolmap
diff --git a/... Code/HostsToolForMac/Carthage/Build/iOS/E0774270-5CE2-3B0F-B936-D3A0AA635EF4.bcsymbolmap b/... Code/HostsToolForMac/Carthage/Build/iOS/E0774270-5CE2-3B0F-B936-D3A0AA635EF4.bcsymbolmap
diff --git a/Source Code/HostsToolForMac/Carthage/Build/iOS/RxAtomic.framework.dSYM/Contents/Info.plist b/Source Code/HostsToolForMac/Carthage/Build/iOS/RxAtomic.framework.dSYM/Contents/Info.plist
diff --git a/...tsToolForMac/Carthage/Build/iOS/RxAtomic.framework.dSYM/Contents/Resources/DWARF/RxAtomic b/...tsToolForMac/Carthage/Build/iOS/RxAtomic.framework.dSYM/Contents/Resources/DWARF/RxAtomic
diff --git a/Source Code/HostsToolForMac/Carthage/Build/iOS/RxAtomic.framework/Headers/RxAtomic.h b/Source Code/HostsToolForMac/Carthage/Build/iOS/RxAtomic.framework/Headers/RxAtomic.h
diff --git a/Source Code/HostsToolForMac/Carthage/Build/iOS/RxAtomic.framework/Info.plist b/Source Code/HostsToolForMac/Carthage/Build/iOS/RxAtomic.framework/Info.plist
diff --git a/Source Code/HostsToolForMac/Carthage/Build/iOS/RxAtomic.framework/Modules/module.modulemap b/Source Code/HostsToolForMac/Carthage/Build/iOS/RxAtomic.framework/Modules/module.modulemap
diff --git a/Source Code/HostsToolForMac/Carthage/Build/iOS/RxAtomic.framework/RxAtomic b/Source Code/HostsToolForMac/Carthage/Build/iOS/RxAtomic.framework/RxAtomic
diff --git a/...e/HostsToolForMac/Carthage/Build/watchOS/47664D76-7B7F-39F9-A857-1A5C1E7F0B67.bcsymbolmap b/...e/HostsToolForMac/Carthage/Build/watchOS/47664D76-7B7F-39F9-A857-1A5C1E7F0B67.bcsymbolmap
diff --git a/...e/HostsToolForMac/Carthage/Build/watchOS/8BA18AEE-69F4-37D7-9826-786A815A07DD.bcsymbolmap b/...e/HostsToolForMac/Carthage/Build/watchOS/8BA18AEE-69F4-37D7-9826-786A815A07DD.bcsymbolmap
diff --git a/...e Code/HostsToolForMac/Carthage/Build/watchOS/RxAtomic.framework.dSYM/Contents/Info.plist b/...e Code/HostsToolForMac/Carthage/Build/watchOS/RxAtomic.framework.dSYM/Contents/Info.plist
diff --git a/...olForMac/Carthage/Build/watchOS/RxAtomic.framework.dSYM/Contents/Resources/DWARF/RxAtomic b/...olForMac/Carthage/Build/watchOS/RxAtomic.framework.dSYM/Contents/Resources/DWARF/RxAtomic
diff --git a/Source Code/HostsToolForMac/Carthage/Build/watchOS/RxAtomic.framework/Headers/RxAtomic.h b/Source Code/HostsToolForMac/Carthage/Build/watchOS/RxAtomic.framework/Headers/RxAtomic.h
diff --git a/Source Code/HostsToolForMac/Carthage/Build/watchOS/RxAtomic.framework/Info.plist b/Source Code/HostsToolForMac/Carthage/Build/watchOS/RxAtomic.framework/Info.plist