Update MIT-LICENSE.txt

zythum · Feb 21, 2017 · ecdd547 · ecdd547
1 parent 99b1a0d
commit ecdd547
Showing 1 changed file with 1 addition and 5 deletions.
diff --git 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.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.