From 581f6e42eaa140a0ed24b26ad921edd06d754643 Mon Sep 17 00:00:00 2001 From: Mark Phillips Date: Wed, 1 Feb 2012 15:26:38 -0800 Subject: [PATCH] head --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 7537b63..b5f1ef4 100644 --- a/README.md +++ b/README.md @@ -28,8 +28,6 @@ This should be updated fairly regularly. As usual, **pull requests are encourage * [CoffeeScript](http://coffeescript.org/) (contributed by [@joedevivo](https://twitter.com/#!/joedevivo)) * [Why's (Poignant) Guide to Ruby](http://mislav.uniqpath.com/poignant-guide/) (contributed by [@joedevivo](https://twitter.com/#!/joedevivo)) * [A Beginner's Guide To HTML and CSS](http://learn.shayhowe.com/html-css/terminology-syntax-intro) -<<<<<<< HEAD -<<<<<<< HEAD * [CodeIgnitor](http://codeigniter.com/user_guide/toc.html) (contributed by [@joshuapoehls](https://twitter.com/#!/joshuapoehls)) * [Twitter Bootstrap](http://twitter.github.com/bootstrap/) and [v2](http://markdotto.com/bs2/docs/index.html) - Documented the project using the project. (contributed by [@kylewest](https://twitter.com/kylewest)) * [hogan.js](http://twitter.github.com/hogan.js/) - Simple and Beautiful. (contributed by [@kylewest](https://twitter.com/kylewest))