]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
projects / thirdparty / freeradius-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fe9b809)
rlm_dict: fix unmerged comments 2009/head
authorMatthew Newton <matthew-git@newtoncomputing.co.uk>
Wed, 19 Jul 2017 11:56:22 +0000 (12:56 +0100)
committerMatthew Newton <matthew-git@newtoncomputing.co.uk>
Wed, 19 Jul 2017 11:56:22 +0000 (12:56 +0100)
src/modules/rlm_dict/README.md patch | blob | blame | history

diff --git a/src/modules/rlm_dict/README.md b/src/modules/rlm_dict/README.md
index 05eddb4a036c0e641b0623411ad878dd08ac581f..a368ec7802412d4359d5b776e094e944f1795676 100644 (file)
--- 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
Mirror of https://github.com/FreeRADIUS/freeradius-server.git