[WIDL 20/20] Fix Merge Conflict

[Robert Shearman]

ChangeLog:
Fix merge conflict.

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



-------------- next part --------------
A non-text attachment was scrubbed...
Name: 9369dc1ab8990f9c2762431e30699452194e1441.diff
Type: text/x-patch
Size: 769 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20051223/d6384130/9369dc1ab8990f9c2762431e30699452194e1441.diff