fix merge conflict

Browse Source

...

This commit is contained in:

Patrick Mayr

2020-08-24 12:40:00 +00:00

parent cdf1b8c83a

commit cc410ab78a

6 changed files with 31 additions and 34 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

fet2020/templates/members/show_member.html