From ce6e1ddfd09c47fc3f80e4fccc238894cf560ddb Mon Sep 17 00:00:00 2001 From: A. Täffner <darkalex@firesplash.de> Date: Fri, 22 Jan 2016 13:16:39 -0500 Subject: [PATCH] updated master, resolved conflicts --- interface/web/help/index.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/interface/web/help/index.php b/interface/web/help/index.php index 93204bc..5aa5f9c 100644 --- a/interface/web/help/index.php +++ b/interface/web/help/index.php @@ -13,4 +13,4 @@ <p> </p> </div> </BODY> -</HTML> \ No newline at end of file +</HTML> -- Gitblit v1.9.1