1.first commit

.gitignore

@@ -1,8 +1,21 @@
+<<<<<<< HEAD
 # OS X
 .DS_Store
 
 # Xcode
 build/
+=======
+# ---> Swift
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData
+
+## Various settings
+>>>>>>> b2ba1ce6ee13d93a4136f9bbd279495c6515309d
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -11,6 +24,7 @@ build/
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
+<<<<<<< HEAD
 xcuserdata/
 *.xccheckout
 profile
@@ -22,11 +36,36 @@ DerivedData
 # Bundler
 .bundle
 
+=======
+xcuserdata
+
+## Other
+*.xccheckout
+*.moved-aside
+*.xcuserstate
+*.xcscmblueprint
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
+#
+# Pods/
+
+# Carthage
+#
+>>>>>>> b2ba1ce6ee13d93a4136f9bbd279495c6515309d
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
 # Carthage/Checkouts
 
 Carthage/Build
 
+<<<<<<< HEAD
 # We recommend against adding the Pods directory to your .gitignore. However
 # you should judge for yourself, the pros and cons are mentioned at:
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
@@ -35,3 +74,50 @@ Carthage/Build
 # `pod install` in .travis.yml
 #
 # Pods/
+=======
+# ---> Objective-C
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+
+## Other
+*.xccheckout
+*.moved-aside
+*.xcuserstate
+*.xcscmblueprint
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+#Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+>>>>>>> b2ba1ce6ee13d93a4136f9bbd279495c6515309d

LICENSE

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 Copyright (c) 2021 wenweiwei <wenweiwei@piaoquantv.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -17,3 +18,13 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+=======
+MIT License
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+>>>>>>> b2ba1ce6ee13d93a4136f9bbd279495c6515309d

README.md

@@ -1,5 +1,6 @@
 # BFCommonKit
 
+<<<<<<< HEAD
 [![CI Status](https://img.shields.io/travis/wenweiwei/BFCommonKit.svg?style=flat)](https://travis-ci.org/wenweiwei/BFCommonKit)
 [![Version](https://img.shields.io/cocoapods/v/BFCommonKit.svg?style=flat)](https://cocoapods.org/pods/BFCommonKit)
 [![License](https://img.shields.io/cocoapods/l/BFCommonKit.svg?style=flat)](https://cocoapods.org/pods/BFCommonKit)
@@ -27,3 +28,6 @@ wenweiwei, wenweiwei@piaoquantv.com
 ## License
 
 BFCommonKit is available under the MIT license. See the LICENSE file for more info.
+=======
+基础库
+>>>>>>> b2ba1ce6ee13d93a4136f9bbd279495c6515309d