fix merge conflict

This commit is contained in:
Marc Delisle
2010-07-17 09:56:24 -04:00

View File

@@ -1867,7 +1867,7 @@ $cfg['TrustedProxies'] =
editing.</dd>
<dt id="cfg_LimitChars">$cfg['LimitChars'] integer</dt>
<dd>Maximum number of characters showen in any non-numeric column on browse view.
<dd>Maximum number of characters shown in any non-numeric field on browse view.
Can be turned off by a toggle button on the browse page.</dd>
<dt><span id="cfg_ModifyDeleteAtLeft">$cfg['ModifyDeleteAtLeft'] </span>boolean