diff options
author | Renato Botelho <renato@netgate.com> | 2015-10-22 13:43:34 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-10-22 13:43:34 -0200 |
commit | 3ea96dcf099bf6ede98b941a9712f9183922cac0 (patch) | |
tree | 83531c9cb2073b710ac3ca94d8891de5c1dbb547 /src | |
parent | 65a5bee19606ab69fe462c42fe373522eda170aa (diff) | |
download | pfsense-3ea96dcf099bf6ede98b941a9712f9183922cac0.zip pfsense-3ea96dcf099bf6ede98b941a9712f9183922cac0.tar.gz |
Remove a leftover from merge
Diffstat (limited to 'src')
-rw-r--r-- | src/etc/inc/authgui.inc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/etc/inc/authgui.inc b/src/etc/inc/authgui.inc index 090faae..51e080f 100644 --- a/src/etc/inc/authgui.inc +++ b/src/etc/inc/authgui.inc @@ -130,7 +130,6 @@ function display_error_form($http_code, $desc) { } ?> -<<<<<<< HEAD <!DOCTYPE html> <html lang="en"> <head> |