From ecdd5479e8d188ceff32293c1e87fb61dbc920b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E4=B8=80?= Date: Tue, 21 Feb 2017 23:51:54 +0800 Subject: [PATCH] Update MIT-LICENSE.txt --- MIT-LICENSE.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt index e5c0921..0f74e88 100755 --- a/MIT-LICENSE.txt +++ b/MIT-LICENSE.txt @@ -1,8 +1,4 @@ -<<<<<<< HEAD Copyright 2017 Zythum_朱一 https://github.com/zythum/weibotuchuang-electron -======= -Copyright 2015 Zythum_朱一 http://zythum.github.io/mama2/ ->>>>>>> 6ab58ed196a3fdc8114a72cadfb46c71683c7bfc Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -21,4 +17,4 @@ 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. \ No newline at end of file +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.