update readme and license.

Xcoder1011 · Xcoder1011 · commit ce60f93806e4 · 2022-10-24T14:20:57.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Xcode
 #
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
@@ -20,7 +19,7 @@ DerivedData/
 
 # Xcode
 build/
->>>>>>> 938d2e6 (Initial commit)
+
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -29,7 +28,7 @@ build/
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-<<<<<<< HEAD
+
 
 ## Obj-C/Swift specific
 *.hmap
@@ -97,7 +96,7 @@ fastlane/test_output
 # https://github.com/johnno1962/injectionforxcode
 
 iOSInjectionProject/
-=======
+
 xcuserdata/
 *.xccheckout
 *.moved-aside
@@ -121,4 +120,4 @@ Carthage/Build
 # `pod install` in .travis.yml
 #
 # Pods/
->>>>>>> 938d2e6 (Initial commit)
+
diff --git a/LICENSE b/LICENSE
@@ -1,10 +1,6 @@
-<<<<<<< HEAD
 MIT License
 
-Copyright (c) 2022 Wu Shangkun
-=======
 Copyright (c) 2022 Xcoder1011 <shangkunwu@msn.com>
->>>>>>> 938d2e6 (Initial commit)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -13,23 +9,12 @@ 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:
 
-<<<<<<< HEAD
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-=======
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
->>>>>>> 938d2e6 (Initial commit)
 
 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,
-<<<<<<< HEAD
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-=======
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
->>>>>>> 938d2e6 (Initial commit)
diff --git a/README.md b/README.md
@@ -1,7 +1,5 @@
 # SKApmTools
-<<<<<<< HEAD
-APM性能优化相关（swift版本 ）：ANR卡顿监测、网络优化、内存监控、启动优化、常见crash防护、crash监控上报
-=======
+
 
 [![CI Status](https://img.shields.io/travis/Xcoder1011/SKApmTools.svg?style=flat)](https://travis-ci.org/Xcoder1011/SKApmTools)
 [![Version](https://img.shields.io/cocoapods/v/SKApmTools.svg?style=flat)](https://cocoapods.org/pods/SKApmTools)
@@ -33,4 +31,3 @@ Xcoder1011, shangkunwu@msn.com
 ## License
 
 SKApmTools is available under the MIT license. See the LICENSE file for more info.
->>>>>>> 938d2e6 (Initial commit)
