Print conflict details with the new infrastructure (bug #11181)

[stgit] / templates / mailattch.tmpl

diff --git a/templates/mailattch.tmpl b/templates/mailattch.tmpl
index 430b341..70d2df0 100644 (file)
--- a/templates/mailattch.tmpl
+++ b/templates/mailattch.tmpl
@@ -11,7 +11,6 @@ Content-Disposition: inline
 
 %(fromauth)s%(longdescr)s
 ---
-
 %(diffstat)s
 --MIMEBOUNDARY
 Content-Type: text/plain; name=%(patch)s.patch