summaryrefslogtreecommitdiffstats
path: root/src/etc/inc/priv.inc
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/inc/priv.inc
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/inc/priv.inc')
-rw-r--r--src/etc/inc/priv.inc5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/etc/inc/priv.inc b/src/etc/inc/priv.inc
index 851643b..676351b 100644
--- a/src/etc/inc/priv.inc
+++ b/src/etc/inc/priv.inc
@@ -1,5 +1,4 @@
<?php
-/* $Id$ */
/*
priv.inc
Copyright (C) 2008 Shrew Soft Inc
@@ -40,10 +39,6 @@
*/
-/*
- pfSense_MODULE: auth
-*/
-
require_once("priv.defs.inc");
/* Load and process custom privs. */
OpenPOWER on IntegriCloud