From 8d60968b328b66c80be8056b7a476771042074bf Mon Sep 17 00:00:00 2001 From: Mark Phillips Date: Mon, 3 Mar 2014 21:23:54 -0800 Subject: [PATCH] missed something --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index d40b919..b231ddc 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,6 @@ This should be updated fairly regularly. As usual, **pull requests are encourage * [ApiGen](http://apigen.org/) - Creates clean API documentation from PHP source code (contributed by [bryceadams](http://bryce.se/)) * [docgenerator](https://github.com/Ralt/docgenerator/blob/master/README.md) - Organize your documentation in Markdown files. (contributed by [Florian Margaine](http://margaine.com)) * [dexy](http://www.dexy.it/) - Extensible documentation/report generator supporting multiple programming languages and serveral input and output formats. (contributed by [troytop](http://github.com/troytop)) -<<<<<<< HEAD * [Slate](https://github.com/tripit/slate) - Static API documentation creation tool from the team at Tripit. * [MireDot](http://www.miredot.com) - REST API documentation generator for Java. Plugs into your build process and generates a searchable html page. (contributed by [bertvh](https://github.com/bertvh)) * [Flatdoc](http://ricostacruz.com/flatdoc/) - Create well designed open source documentation from Github repository README files or simple Markdown files. (contributed by [@moore](http://twitter.com/moore))