From 308a5033320e70d425ec622fe2ceb1f51d33a24d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 30 Nov 2015 11:00:08 +0100 Subject: [PATCH] remove extra line added during merge conflict resolution --- Documentation/doc/Documentation/packages.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/doc/Documentation/packages.txt b/Documentation/doc/Documentation/packages.txt index 59c7414d3cc..afb86af76f2 100644 --- a/Documentation/doc/Documentation/packages.txt +++ b/Documentation/doc/Documentation/packages.txt @@ -153,7 +153,6 @@ h1 { \package_listing{Solver_interface} \package_listing{Property_map} \package_listing{Cone_spanners_2} -\package_listing{Point_set_processing_3/Property_map} \package_listing{Circulator} \package_listing{Generator} \package_listing{Miscellany}