diff options
| -rw-r--r-- | Nt32Pkg/Nt32.dsc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Nt32Pkg/Nt32.dsc b/Nt32Pkg/Nt32.dsc index f26a885..157298e 100644 --- a/Nt32Pkg/Nt32.dsc +++ b/Nt32Pkg/Nt32.dsc @@ -406,7 +406,6 @@ [Components.IA32]
${WORKSPACE}/Nt32Pkg/BootModePei/BootMode.inf
$(WORKSPACE)/Nt32Pkg/WinNtThunkDxe/WinNtThunk.inf
-<<<<<<< .mine
# ${WORKSPACE}/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf
$(WORKSPACE)\Nt32Pkg\WinNtThunkDxe\WinNtThunk.inf
$(WORKSPACE)\Nt32Pkg\WinNtThunkPPIToProtocolPei\WinNtThunkPPIToProtocol.inf
|