Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove merge error

Browse Source 
svn: r12929
This commit is contained in:
Raphael Ackermann 2009-08-08 21:40:12 +00:00
parent 5ae1a75bc0
commit 6c07dfc9dd
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/webreport/NarrativeWeb.py
View File

@ -1519,14 +1519,8 @@ class SurnamePage(BasePage):
if not first_family: if not first_family:
tcell += ',' tcell += ','
if partner_handle in report_handle_list: 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) url = self.report.build_url_fname_html(partner_handle, 'ppl', True)
tcell += self.individual_link(url, partner) tcell += self.individual_link(url, partner)
>>>>>>> .r12915
else: else:
tcell += partner_name tcell += partner_name
else: else: