Alexandre Julliard : Fix some merge glitches.

[Alexandre Julliard]

Module: bugzilla
Branch: master
Commit: 9e26ae2d5b2a0c0f8aaec91c1ea24d7e6408ad6d
URL:    http://source.winehq.org/git/bugzilla.git/?a=commit;h=9e26ae2d5b2a0c0f8aaec9...

Author: Alexandre Julliard 
Date:   Wed May 13 20:21:08 2009 +0200

Fix some merge glitches.

---

template/en/default/global/header.html.tmpl |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/admin.cgi b/admin.cgi
old mode 100644
new mode 100755
diff --git a/editworkflow.cgi b/editworkflow.cgi
old mode 100644
new mode 100755
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index a247f6e..390902f 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -280,7 +280,6 @@
   [% END %]
 </tr>
 </table>
-</div>

<div id="header">
 [% PROCESS "global/common-links.html.tmpl" qs_suffix = "_top" %]