From 88cc9ffcbcd738c02f73aafd3f5b8da6b5fb56e4 Mon Sep 17 00:00:00 2001
From: Matthew L Daniel <mdaniel@gmail.com>
Date: Sun, 20 Feb 2022 10:29:17 -0800
Subject: [PATCH] Fix a link from 423a894

---
 docs/conflicts.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conflicts.md b/docs/conflicts.md
index 5983fd9f1..c548038bb 100644
--- a/docs/conflicts.md
+++ b/docs/conflicts.md
@@ -45,4 +45,4 @@ The deeper understanding of conflicts has many advantages:
   interact with your project using Git.)
 
 For information about how conflicts are handled in the working copy, see
-[here](working_copy.md#conflicts).
+[here](working-copy.md#conflicts).