summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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