From 7ecf6717cfda0ed233fb69f8daff315a52663074 Mon Sep 17 00:00:00 2001
From: Leif Lindholm <leif.lindholm@linaro.org>
Date: Wed, 18 Sep 2019 21:35:08 +0100
Subject: [PATCH] BaseTools: fix line endings in SetupGit.py Conf files

A file header license/copyright header copied around in commit
5b3e695d8ac5 ("BaseTools: add centralized location for git config files")
was missing a CR - add it in both faulty locations.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 BaseTools/Conf/diff.order    | 2 +-
 BaseTools/Conf/gitattributes | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Conf/diff.order b/BaseTools/Conf/diff.order
index 68b926ca94..4361817012 100644
--- a/BaseTools/Conf/diff.order
+++ b/BaseTools/Conf/diff.order
@@ -2,7 +2,7 @@
 # Copyright (c) 2019, Linaro Ltd. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
-#
+#
 *.dec
 *.dsc.inc
 *.dsc
diff --git a/BaseTools/Conf/gitattributes b/BaseTools/Conf/gitattributes
index 9b6ab81a47..58b93e9d4c 100644
--- a/BaseTools/Conf/gitattributes
+++ b/BaseTools/Conf/gitattributes
@@ -2,7 +2,7 @@
 # Copyright (c) 2019, Linaro Ltd. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
-#
+#
 *.efi     -diff
 *.EFI     -diff
 *.bin     -diff