From 16e29df2c78e508acb01f110a3e4e0ccbbad761d Mon Sep 17 00:00:00 2001 From: markjcrane Date: Mon, 21 Dec 2015 00:02:50 -0700 Subject: [PATCH] Fix a problem with xml_cdr/app_languages.php. --- app/xml_cdr/app_languages.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/xml_cdr/app_languages.php b/app/xml_cdr/app_languages.php index 97e7036472..9dc531f8aa 100644 --- a/app/xml_cdr/app_languages.php +++ b/app/xml_cdr/app_languages.php @@ -593,8 +593,6 @@ $text['label-name']['uk'] = "Назва"; $text['label-name']['de-at'] = "Name"; $text['label-name']['he'] = "שם"; -======= ->>>>>>> remotes/origin/Enhance-Languages $text['label-missed']['en-us'] = "Missed"; $text['label-missed']['es-cl'] = "Perdidas"; $text['label-missed']['pt-pt'] = "Perdidas";