From 6c07dfc9dda755450cb8dc6ab456c5abea28230c Mon Sep 17 00:00:00 2001 From: Raphael Ackermann Date: Sat, 8 Aug 2009 21:40:12 +0000 Subject: [PATCH] remove merge error svn: r12929 --- src/plugins/webreport/NarrativeWeb.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index 2ad562a78..e35d3708d 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -1519,14 +1519,8 @@ class SurnamePage(BasePage): if not first_family: tcell += ',' if partner_handle in report_handle_list: -<<<<<<< .mine - url = self.report.build_url_fname_html( - partner_handle, 'ppl', True) - tcell += self.individual_link(url, partner) -======= url = self.report.build_url_fname_html(partner_handle, 'ppl', True) tcell += self.individual_link(url, partner) ->>>>>>> .r12915 else: tcell += partner_name else: