Update contributors.md

9 years ago · 5c5fe7e130
parent 12ff770afe
commit 5c5fe7e130
1 changed files with 0 additions and 3 deletions
--- a/contributors.md
+++ b/contributors.md
@ -74,8 +74,5 @@ Thank you to all contributors:
 * [Dennis Birkholz](https://github.com/dennisbirkholz)
 * [Anton Tyurin](https://github.com/noxiouz)
 * [Bogdan Kulbida](https://github.com/kulbida)
-<<<<<<< HEAD
 * [Matt Hudgins](https://github.com/mhudgins)
-=======
 * [Ruth Grace Wong](https://github.com/ruthgrace)
->>>>>>> fixed grammar mistakes in linux-bootstrap-4.md, Long mode section