From a42573b9f649b97f41b2ddfec253211f9857f21a Mon Sep 17 00:00:00 2001
From: Matthew Newton <matthew-git@newtoncomputing.co.uk>
Date: Wed, 19 Jul 2017 12:56:22 +0100
Subject: [PATCH] rlm_dict: fix unmerged comments

---
 src/modules/rlm_dict/README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/modules/rlm_dict/README.md b/src/modules/rlm_dict/README.md
index 05eddb4a036..a368ec78024 100644
--- a/src/modules/rlm_dict/README.md
+++ b/src/modules/rlm_dict/README.md
@@ -5,8 +5,4 @@
 </dl>
 
 ## Summary
-<<<<<<< Updated upstream
-Registers xlats to access dictionary data
-=======
 Registers xlats and maps to access dictionary data
->>>>>>> Stashed changes
-- 
2.47.3