diff options
| author | ninadsp <ninadsp16289@gmail.com> | 2010-07-29 17:47:25 +0400 |
|---|---|---|
| committer | ninadsp <ninadsp16289@gmail.com> | 2010-07-29 17:47:25 +0400 |
| commit | a2f78a6d38f74f0cc62f2a5837e682901331c21e (patch) | |
| tree | ceab0c3ae4efe05fe345f270bdf4d236d24ef63d /tbl_import.php | |
| parent | 2bec345a46d11293b93c2b06bf8009c913cde8fb (diff) | |
| parent | d0fc397fe1c474150883e85a791a012a7ae03380 (diff) | |
Resolve merge conflicts for upstream merge
Diffstat (limited to 'tbl_import.php')
| -rwxr-xr-x | tbl_import.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tbl_import.php b/tbl_import.php index ead8ff0e79..6fb74cd2a1 100755 --- a/tbl_import.php +++ b/tbl_import.php @@ -28,6 +28,6 @@ require_once './libraries/display_import.lib.php'; /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> |