diff options
| author | Colin Smith <colin@pfsense.org> | 2005-09-13 18:14:30 +0000 |
|---|---|---|
| committer | Colin Smith <colin@pfsense.org> | 2005-09-13 18:14:30 +0000 |
| commit | 6212658ffa71a43702ddc1c3bf5f75d06a04e514 (patch) | |
| tree | d041a7983d3e1d5b0d75a8f1b6a9fb0208561825 /usr | |
| parent | bc7f52e256db233581045f5071c890bc275e5c9a (diff) | |
| download | pfsense-6212658ffa71a43702ddc1c3bf5f75d06a04e514.zip pfsense-6212658ffa71a43702ddc1c3bf5f75d06a04e514.tar.gz | |
I'm an idiot - clean up CVS merge message.
Diffstat (limited to 'usr')
| -rwxr-xr-x | usr/local/www/guiconfig.inc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc index 5becffd..b4e68ea 100755 --- a/usr/local/www/guiconfig.inc +++ b/usr/local/www/guiconfig.inc @@ -1,9 +1,5 @@ <?php -<<<<<<< guiconfig.inc /* $Id$ */ -======= -/* $Id$ */ ->>>>>>> 1.86 /* guiconfig.inc by Scott Ullrich, Copyright 2004, All rights reserved. |
