[dak/master] stupid bad merge syntax error

[Mike O'Connor <stew@vireo.org>]

Signed-off-by: Mike O'Connor <stew@vireo.org>
---
 daklib/database.py |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/daklib/database.py b/daklib/database.py
index 3b6ded0..c274a63 100755
--- a/daklib/database.py
+++ b/daklib/database.py
@@ -829,9 +829,8 @@ def copy_temporary_contents(package, version, deb):
         subst = {
             "__PACKAGE__": package,
             "__VERSION__": version,
-            "__TO_ADDRESS__": Cnf["Dinstall::MyAdminAddress",
-            "__DAK_ADDRESS__": Cnf["Dinstall::MyEmailAddress"]
-            }
+            "__TO_ADDRESS__": Cnf["Dinstall::MyAdminAddress"],
+            "__DAK_ADDRESS__": Cnf["Dinstall::MyEmailAddress"] }
 
         message = utils.TemplateSubst(Subst, Cnf["Dir::Templates"]+"/missing-contents")
         utils.send_mail( message )
-- 
1.5.6.5