summaryrefslogtreecommitdiffstats
path: root/MdeModulePkg/Bus
diff options
context:
space:
mode:
authorYuan Yu <yuanyu@google.com>2023-02-01 14:31:17 +0800
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2023-02-04 01:52:18 +0000
commit7623b4bf6a4541b1bc5ad1978f27a55f2fb62c5f (patch)
tree202d79e70d97a823db6d664b27b1a18efb277324 /MdeModulePkg/Bus
parent13b97736c876919b9786055829caaa4fa46984b7 (diff)
downloadedk2-7623b4bf6a4541b1bc5ad1978f27a55f2fb62c5f.tar.gz
edk2-7623b4bf6a4541b1bc5ad1978f27a55f2fb62c5f.tar.bz2
edk2-7623b4bf6a4541b1bc5ad1978f27a55f2fb62c5f.zip
MdeModulePkg: ScsiDiskDxe: clean up comment in ScsiDisk.c
Comment of MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c was polluted by some previous merge. This patch clean it up. Cc: Ard Biesheuvel <ardb+tianocore@kernel.org> Cc: Liming Gao <gaoliming@byosoft.com.cn> Cc: Hao A Wu <hao.a.wu@intel.com> Cc: Ray Ni <ray.ni@intel.com> Cc: Sivaparvathi chellaiah <sivaparvathic@ami.com> Signed-off-by: Yuan Yu <yuanyu@google.com> Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
Diffstat (limited to 'MdeModulePkg/Bus')
-rw-r--r--MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
index 6555aeed7d..fbc236cb46 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
@@ -3,10 +3,6 @@
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
**/