summaryrefslogtreecommitdiffstats
path: root/src/etc/login.conf
diff options
context:
space:
mode:
authorDavid Wood <david@wood2.org.uk>2015-12-31 13:46:50 +0000
committerDavid Wood <david@wood2.org.uk>2015-12-31 13:46:50 +0000
commit60e15be211c5de855ab3d9746c78eb7296c50cde (patch)
tree862af8eaa4a8ba95af792b3c98c484e33f2bc2ca /src/etc/login.conf
parent2e4cad90499f968474c4eca0852f352f1526b617 (diff)
parent8dccfb20643cfda6b55429177410e6c66fcf0bbd (diff)
downloadpfsense-60e15be211c5de855ab3d9746c78eb7296c50cde.zip
pfsense-60e15be211c5de855ab3d9746c78eb7296c50cde.tar.gz
Merge remote-tracking branch 'upstream/master' into rfc4638, fix conflict with c399d0d
Diffstat (limited to 'src/etc/login.conf')
-rw-r--r--src/etc/login.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/login.conf b/src/etc/login.conf
index 1e61a9f..98324e2 100644
--- a/src/etc/login.conf
+++ b/src/etc/login.conf
@@ -35,7 +35,7 @@ default:\
:maxproc=unlimited:\
:sbsize=unlimited:\
:vmemoryuse=unlimited:\
- :idletime=unlimited:\
+ :idletime=unlimited:\
:priority=0:\
:ignoretime@:\
:umask=022:
@@ -81,7 +81,7 @@ russian|Russian Users Accounts:\
######################################################################
##
## Example entries
-##
+##
######################################################################
######################################################################
OpenPOWER on IntegriCloud