Robert Shearman : widl: Fix merge conflict.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: f56737579e49aab5592a928d98d1e8c11d539368
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=f56737579e49aab5592a928d...

Author: Robert Shearman 
Date:   Mon Dec 26 13:22:46 2005 +0100

widl: Fix merge conflict.

---

tools/widl/typegen.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c
index bc3710a..1346729 100644
--- a/tools/widl/typegen.c
+++ b/tools/widl/typegen.c
@@ -413,7 +413,6 @@ void marshall_arguments(FILE *file, int 
             fprintf(file, "_StubMsg.Buffer += sizeof(");
             write_type(file, var->type, var, var->tname);
             fprintf(file, ");\n");
-            fprintf(file, "\n");

last_size = size;
         }
@@ -588,7 +587,6 @@ void unmarshall_arguments(FILE *file, in
             fprintf(file, "_StubMsg.Buffer += sizeof(");
             write_type(file, var->type, var, var->tname);
             fprintf(file, ");\n");
-            fprintf(file, "\n");

last_size = size;
         }