From 05beae43cfeb15ea89b984d36105dcdbdffd0975 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Fri, 18 Oct 2013 09:16:34 -0400 Subject: [PATCH] Resolved differences from svn merge to trunk and git master --- interface/web/help/index.php | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/interface/web/help/index.php b/interface/web/help/index.php index d80c420..93204bc 100644 --- a/interface/web/help/index.php +++ b/interface/web/help/index.php @@ -1,17 +1,16 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<HTML> -<HEAD> -<TITLE>42go Hilfe</TITLE> -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=iso-iso-8859-1"> -</HEAD> -<BODY BGCOLOR="#FFFFFF"> -<div align="center"> - <p> </p> - <p> </p> - <p> </p> - <p> </p> - <p>ONLINE HILFE - </p> -</div> -</BODY> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<HTML> +<HEAD> +<TITLE>ISPConfig Help</TITLE> +<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=iso-iso-8859-1"> +</HEAD> +<BODY BGCOLOR="#FFFFFF"> +<div align="center"> + <p> </p> + <p> </p> + <p> </p> + <p> </p> + <p> </p> +</div> +</BODY> </HTML> \ No newline at end of file -- Gitblit v1.9.1