JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixpkgs manual: remove cruft from a merge conflict

Browse Source 
It was clearly added unintentionally during #14243 merge.
This commit is contained in:
Vladimír Čunát 2016-03-29 10:02:57 +02:00
parent 63c78c34ab
commit b44b0ab27c
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
doc/languages-frameworks/index.xml
View File

@ -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>