更新协议

Author: wangdabaoqq

LICENSE

@@ -1,38 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 351c45cbf9d33f383178abc122eb9292f4e9918d
-=======
->>>>>>> 5791f5248f5c4e36c3da93ea787aa9c6ca48f4da
-=======
->>>>>>> e8286b4cb4d6bd8602ba870298b8dc1a99d46024
-<<<<<<< HEAD
-=======
->>>>>>> 09fcf8954d4ccbbd775f411cfecb70f62945ef2c
-=======
->>>>>>> 351c45cbf9d33f383178abc122eb9292f4e9918d
-MIT License
-
-Copyright (c) 2017 宝宝宝
-
-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:
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 351c45cbf9d33f383178abc122eb9292f4e9918d
-=======
->>>>>>> e8286b4cb4d6bd8602ba870298b8dc1a99d46024
-=======
 The MIT License (MIT)
 
 Copyright (c) 2017 胡萝卜
@@ -43,66 +8,15 @@ 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:
->>>>>>> cbabb49372a94216675f0ffa5b2706d1957fb6f7
-<<<<<<< HEAD
-=======
->>>>>>> 5791f5248f5c4e36c3da93ea787aa9c6ca48f4da
-=======
->>>>>>> e8286b4cb4d6bd8602ba870298b8dc1a99d46024
-<<<<<<< HEAD
-=======
->>>>>>> 09fcf8954d4ccbbd775f411cfecb70f62945ef2c
-=======
->>>>>>> 351c45cbf9d33f383178abc122eb9292f4e9918d
+
 
 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
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 351c45cbf9d33f383178abc122eb9292f4e9918d
-=======
->>>>>>> 5791f5248f5c4e36c3da93ea787aa9c6ca48f4da
-=======
->>>>>>> e8286b4cb4d6bd8602ba870298b8dc1a99d46024
-<<<<<<< HEAD
-=======
->>>>>>> 09fcf8954d4ccbbd775f411cfecb70f62945ef2c
-=======
->>>>>>> 351c45cbf9d33f383178abc122eb9292f4e9918d
 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.
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 351c45cbf9d33f383178abc122eb9292f4e9918d
-=======
->>>>>>> e8286b4cb4d6bd8602ba870298b8dc1a99d46024
-=======
-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.
->>>>>>> cbabb49372a94216675f0ffa5b2706d1957fb6f7
-<<<<<<< HEAD
-=======
->>>>>>> 5791f5248f5c4e36c3da93ea787aa9c6ca48f4da
-=======
->>>>>>> e8286b4cb4d6bd8602ba870298b8dc1a99d46024
-<<<<<<< HEAD
-=======
->>>>>>> 09fcf8954d4ccbbd775f411cfecb70f62945ef2c
-=======
->>>>>>> 351c45cbf9d33f383178abc122eb9292f4e9918d