Overlooked something during the merge

sondr3 · May 29, 2016 · 15116be · 15116be
1 parent 6e851d0
commit 15116be
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -174,13 +174,6 @@ Erases your images from `.tmp` and `dist`.
 
 > `gulp clean:dist`
 
-<<<<<<< HEAD
-[beta]: https://github.com/sondr3/generator-jekyllized/tree/beta
-[jekyll]: https://jekyllrb.com
-[yeoman]: http://yeoman.io
-[yo]: https://github.com/yeoman/yo
-[bower]: http://bower.io/
-=======
 Erases your `dist` folder.
 
 > `gulp clean:gzip`