From c674a7dd163a0726dc6277241fdffe3fccf4b38f Mon Sep 17 00:00:00 2001
From: Timothy Edmund Crosley <timothy.crosley@gmail.com>
Date: Tue, 20 Jul 2021 22:46:06 -0700
Subject: [PATCH] Fix bad merge

---
 isort/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/isort/settings.py b/isort/settings.py
index 73f12d16d..ee7297442 100644
--- a/isort/settings.py
+++ b/isort/settings.py
@@ -555,7 +555,7 @@ def _check_folder_gitignore(self, folder: str) -> Optional[Path]:
             if ".git" in _dirs:
                 _dirs.remove(".git")
             for git_file in git_files:
-                files.append(os.path.join(root, git_file))\
+                files.append(os.path.join(root, git_file))
         git_options = ["-C", str(git_folder), "-c", "core.quotePath="]
         try:
             ignored = subprocess.check_output(  # nosec # skipcq: PYL-W1510