diff options
| author | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-06-28 07:58:29 +0000 |
|---|---|---|
| committer | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-06-28 07:58:29 +0000 |
| commit | 66cb9385e508491a8c601a7c33b056e91ab4512c (patch) | |
| tree | f200dba358abfacd759ab78031d25e27f4413061 | |
| parent | 4abb21937cec2be1db93c1c4ee994d0d40cbcaa2 (diff) | |
| download | edk2-66cb9385e508491a8c601a7c33b056e91ab4512c.zip edk2-66cb9385e508491a8c601a7c33b056e91ab4512c.tar.gz edk2-66cb9385e508491a8c601a7c33b056e91ab4512c.tar.bz2 | |
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2835 6f19259b-4bc3-4df7-8a09-765794883524
| -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
|