From fe30c0b0ff1c17ec352c8a5a9d4e7eeb8365dda7 Mon Sep 17 00:00:00 2001
From: Andreas Valder <andreasv@fsmpi.rwth-aachen.de>
Date: Thu, 1 Sep 2016 22:02:03 +0200
Subject: [PATCH] fixed some merge errors
---
templates/log.html | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/templates/log.html b/templates/log.html
index a3970c2..1cc220e 100644
--- a/templates/log.html
+++ b/templates/log.html
@@ -19,11 +19,7 @@
{% for i in changelog %}
<tr>
<td>{{i.when}}</td>
- {% if i.realname %}
- <td>{{i.realname}} ({{i.who}})</td>
- {% else %}
- <td>{{i.who}}</td>
- {% endif %}
+ <td>{% if (i.who != i.who|string) %}{{i.realname}}{% else %}{{i.who}}{%endif%}</td>
<td>{{i.path}}</td>
<td>"{{i.value_old}}"</td>
<td>"{{i.value_new}}"</td>
--
GitLab