Signed-off-by: Christopher Zurcher <christopher.zurc...@microsoft.com>
Reviewed-by: Liming Gao <gaolim...@byosoft.com.cn>
---
 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c 
b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
index 6555aeed7d..f424ebd041 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
@@ -3,10 +3,7 @@
 
 Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
 Copyright (c) 1985 - 2022, American Megatrends International LLC.<BR>
-<<<<<<< HEAD
-=======
 
->>>>>>> ace365b4e0 (MdeModulePkg/scsi :Coverity scan flags multiple issues in 
edk2-stable202205)
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
-- 
2.37.3.windows.1




-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#98751): https://edk2.groups.io/g/devel/message/98751
Mute This Topic: https://groups.io/mt/96345717/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-


Reply via email to