From b44b0ab27c26dea780aec7476b7d9486798b340a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 29 Mar 2016 10:02:57 +0200
Subject: [PATCH] nixpkgs manual: remove cruft from a merge conflict

It was clearly added unintentionally during #14243 merge.
---
 doc/languages-frameworks/index.xml | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index 63c4b7dec60..395d4688021 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>