[svn-commits] jrose: trunk r348159 - in /trunk: ./ configs/features.conf.sample

[SVN commits to the Digium repositories]

Author: jrose
Date: Wed Dec 14 14:37:11 2011
New Revision: 348159

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=348159
Log:
Fix accidental use of tabs instead of spaces from previous features.conf.sample change
........

Merged revisions 348157 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 348158 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/configs/features.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/configs/features.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/features.conf.sample?view=diff&rev=348159&r1=348158&r2=348159
==============================================================================
--- trunk/configs/features.conf.sample (original)
+++ trunk/configs/features.conf.sample Wed Dec 14 14:37:11 2011
@@ -43,8 +43,8 @@
                                 ;         created in the 'park-dial' context.  This extension will be set up to do a
                                 ;         Dial() to 'SIP/0004F2040001'.
                                 ;
-								;         During the timeout procedure, the following variable is set
-								;         PARKINGSLOT - extension that the call was parked in prior to timing out
+                                ;         During the timeout procedure, the following variable is set
+                                ;         PARKINGSLOT - extension that the call was parked in prior to timing out
 
 ;courtesytone = beep            ; Sound file to play to when someone picks up a parked call
                                 ; and also when the Touch Monitor is activated/deactivated.