summaryrefslogtreecommitdiffstats
path: root/src/etc/inc
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-10-22 13:43:34 -0200
committerRenato Botelho <renato@netgate.com>2015-10-22 13:43:34 -0200
commit3ea96dcf099bf6ede98b941a9712f9183922cac0 (patch)
tree83531c9cb2073b710ac3ca94d8891de5c1dbb547 /src/etc/inc
parent65a5bee19606ab69fe462c42fe373522eda170aa (diff)
downloadpfsense-3ea96dcf099bf6ede98b941a9712f9183922cac0.zip
pfsense-3ea96dcf099bf6ede98b941a9712f9183922cac0.tar.gz
Remove a leftover from merge
Diffstat (limited to 'src/etc/inc')
-rw-r--r--src/etc/inc/authgui.inc1
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>
OpenPOWER on IntegriCloud