config: fix documentation merge issue
authorFelipe Contreras <felipe.contreras@gmail.com>
Fri, 11 Apr 2014 17:31:26 +0000 (12:31 -0500)
committerFelipe Contreras <felipe.contreras@gmail.com>
Fri, 11 Apr 2014 17:31:26 +0000 (12:31 -0500)
commitc73078e16655bbd220310590f61d413e1a6a0fc9
tree9f0d5230fde0f59246c42130241bf2b043383f97
parent4b5378582cd23b6c8e63d534738a465b5bf84ab6
config: fix documentation merge issue

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Documentation/config.txt