kernel32: Fix merge error.
authorAlexander Morozov <amorozov@etersoft.ru>
Tue, 5 Apr 2011 17:55:21 +0000 (21:55 +0400)
committerTest Robot <wine-patches-test@office.etersoft.ru>
Tue, 5 Apr 2011 18:12:32 +0000 (22:12 +0400)
commite7e5f9700905bb1725ff9be96ca6c46fb9894b9b
tree546e40d5f0a3485338cc1b7776b5fb7108e1dc96
parent5c322589594a3a640d8f8fb30365e2f0bf06b09b
kernel32: Fix merge error.
dlls/kernel32/process.c