removed duplicate licence in README

gernest · Jun 11, 2015 · af646c9 · af646c9
1 parent 5cb43df
commit af646c9
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -58,12 +58,4 @@ func main() {
 
 This project is under the MIT License. See the [LICENSE](https://github.com/gernest/nutz/blob/master/LICENCE) file for the full license text.
 
-<<<<<<< HEAD
-=======
-## License
-
-This project is under the MIT License. See the [LICENSE](https://github.com/gernest/nutz/blob/master/LICENCE) file for the full license text.
-
->>>>>>> master
-