diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-03-29 10:02:57 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-03-29 10:02:57 +0200 |
| commit | b44b0ab27c26dea780aec7476b7d9486798b340a (patch) | |
| tree | 10ef340f763ea95ad9fe6bc803151befe4ae8241 /doc | |
| parent | 63c78c34abef3c33556301cf60e4514042ab1795 (diff) | |
| download | nixlib-b44b0ab27c26dea780aec7476b7d9486798b340a.tar nixlib-b44b0ab27c26dea780aec7476b7d9486798b340a.tar.gz nixlib-b44b0ab27c26dea780aec7476b7d9486798b340a.tar.bz2 nixlib-b44b0ab27c26dea780aec7476b7d9486798b340a.tar.lz nixlib-b44b0ab27c26dea780aec7476b7d9486798b340a.tar.xz nixlib-b44b0ab27c26dea780aec7476b7d9486798b340a.tar.zst nixlib-b44b0ab27c26dea780aec7476b7d9486798b340a.zip | |
nixpkgs manual: remove cruft from a merge conflict
It was clearly added unintentionally during #14243 merge.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/languages-frameworks/index.xml | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 63c4b7dec607..395d46880217 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -27,22 +27,5 @@ such as Perl or Haskell. These are described in this chapter.</para> <xi:include href="bower.xml" /> -<!-- -<section><title>Haskell</title> - -<para>TODO</para> - -</section> - - -<section><title>TeX / LaTeX</title> - -<para>* Special support for building TeX documents</para> - -</section> ---> ->>>>>>> 05113a5... nixpkgs manual: Add documentation for bower2nix - - </chapter> |