* [PATCH] MdeModulePkg ScsiDiskDxe: Remove the left git merge comments
@ 2023-01-18 1:43 gaoliming
0 siblings, 0 replies; only message in thread
From: gaoliming @ 2023-01-18 1:43 UTC (permalink / raw)
To: devel; +Cc: Christopher Zurcher
Signed-off-by: Christopher Zurcher <christopher.zurcher@microsoft.com>
Reviewed-by: Liming Gao <gaoliming@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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2023-01-18 1:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-18 1:43 [PATCH] MdeModulePkg ScsiDiskDxe: Remove the left git merge comments gaoliming
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox