Fix broken merge.
authorAleksandar Andrejevic <aandrejevic@reactos.org>
Mon, 21 Apr 2014 01:51:27 +0000 (01:51 +0000)
committerAleksandar Andrejevic <aandrejevic@reactos.org>
Mon, 21 Apr 2014 01:51:27 +0000 (01:51 +0000)
commit5b74bbc25131d4a42af5f67ee2b26ce2efea8365
tree26e0d6ab93bd36561394943ce894d9f575612469
parente2dbefc3101158a091e54805cd7f3d02043c7d03
Fix broken merge.

svn path=/branches/ntvdm/; revision=62850
win32ss/user/winsrv/consrv/include/conio.h