Fix unresolved conflicts in gitignore, readme and en-version of the book
This commit is contained in:
4
.gitignore
vendored
4
.gitignore
vendored
@@ -2,7 +2,3 @@
|
||||
pkg/*
|
||||
*.html
|
||||
*.exe
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
>>>>>>> eead24cf064976b648de5826eab51880c803b0fa
|
||||
|
||||
Reference in New Issue
Block a user