From dea284f5715c8efda8a450ca8fffee6d8e78e83a Mon Sep 17 00:00:00 2001
From: fantu <fantu@ispconfig3>
Date: Tue, 18 Nov 2008 16:43:38 -0500
Subject: [PATCH] Improved merge in language editor: - Remove of the file how not exists in master language - Fix the msg show when no file has been created, removed or modified
---
interface/lib/classes/tpl_error.inc.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/tpl_error.inc.php b/interface/lib/classes/tpl_error.inc.php
index 2f13988..25ea71e 100644
--- a/interface/lib/classes/tpl_error.inc.php
+++ b/interface/lib/classes/tpl_error.inc.php
@@ -10,10 +10,10 @@
//
// $Id: error.php,v 1.1 2003/07/08 12:32:06 platinum Exp $
-define('FATAL', E_USER_ERROR);
+define('FATAL', E_USER_ERROR);
define('WARNING', E_USER_WARNING);
-define('NOTICE', E_USER_NOTICE);
-define('KILL', -1); // used for killing inside parsing.
+define('NOTICE', E_USER_NOTICE);
+define('KILL', -1); // used for killing inside parsing.
/**
* Class is used by vlibTemplate.
--
Gitblit v1.9.1