summaryrefslogtreecommitdiff
path: root/rc.local
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-07-14 18:06:00 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-07-14 18:06:00 -0300
commit97232dd346b6e959675def22596d034100d6e91b (patch)
treef6f6eb1b945ac0a7c467277852fad4bd144a024d /rc.local
parent8c091e9d59baa808a7853e3fa7a570ee94b9375d (diff)
parent046d35bac04022eab343e9e6e40a3056c5e653ad (diff)
Merge branch 'master' of git://projects.archlinux.org/initscripts2012.07.14
Conflicts: PKGBUILD rc.sysinit
Diffstat (limited to 'rc.local')
-rwxr-xr-xrc.local2
1 files changed, 1 insertions, 1 deletions
diff --git a/rc.local b/rc.local
index 4950cba..21254f1 100755
--- a/rc.local
+++ b/rc.local
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# /etc/rc.local: Local multi-user startup script.
+# /etc/rc.local: Local multi-user start-up script.
#