From: Matthew Newton <matthew-git@newtoncomputing.co.uk>
Date: Wed, 19 Jul 2017 11:56:22 +0000 (+0100)
Subject: rlm_dict: fix unmerged comments
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2009%2Fhead;p=thirdparty%2Ffreeradius-server.git

rlm_dict: fix unmerged comments
---

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