Merge branch 'testing'

Conflicts:
	web/html/pkgsubmit.php

Signed-off-by: Loui Chang <louipc.ist@gmail.com>

1 files changed, 0 insertions, 20 deletions

diff --git a/web/html/template.php b/web/html/template.php
deleted file mode 100644
index 11e05e0..0000000
--- a/web/html/template.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang');
-
-include("aur.inc");         # access AUR common functions
-include("template_po.inc"); # use some form of this for i18n support
-set_lang();                 # this sets up the visitor's language
-check_sid();                # see if they're still logged in
-html_header();              # print out the HTML header
-
-
-# Any text you print out to the visitor, use the __() function
-# for i18n support.  See 'testpo.php' for more details.
-#
-print __("Hi, this is worth reading!")."<br />\n";
-
-
-html_footer(AUR_VERSION);
-
-?>