[reactos] 02/02: Merge branch 'master' of https://github.com/reactos/reactos

[James Tabor]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12cfd71058e2953ab11db…

commit 12cfd71058e2953ab11dbee61fa6f2608e116ddb
Merge: 3377fe184e dbb69cb2d9
Author:     James Tabor <james.tabor(a)reactos.org>
AuthorDate: Tue Mar 5 16:03:31 2019 -0600
Commit:     James Tabor <james.tabor(a)reactos.org>
CommitDate: Tue Mar 5 16:03:31 2019 -0600

    Merge branch 'master' of https://github.com/reactos/reactos

 boot/bootdata/hivedef.inf | 4 ++--
 boot/bootdata/hivesft.inf | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)