Fix unresolved conflicts in gitignore, readme and en-version of the book

This commit is contained in:
Denis Koltsov
2016-11-19 14:01:11 +01:00
parent ce406eda04
commit dab03f4a84
4 changed files with 0 additions and 68 deletions

4
.gitignore vendored
View File

@@ -2,7 +2,3 @@
pkg/*
*.html
*.exe
<<<<<<< HEAD
=======
>>>>>>> eead24cf064976b648de5826eab51880c803b0fa