From 1d8a3b7f9a2c04bf304e35bc105aa1643ff6d465 Mon Sep 17 00:00:00 2001 From: markjcrane Date: Sat, 19 Dec 2015 22:04:05 -0700 Subject: [PATCH] Fix the app/xml_cdr/app_languages.php and remove the include ot the import when viewing xml cdr. --- app/xml_cdr/app_languages.php | 3 +-- app/xml_cdr/xml_cdr_inc.php | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/xml_cdr/app_languages.php b/app/xml_cdr/app_languages.php index f70f6a9e53..97e7036472 100644 --- a/app/xml_cdr/app_languages.php +++ b/app/xml_cdr/app_languages.php @@ -571,7 +571,6 @@ $text['label-network_addr']['uk'] = ""; $text['label-network_addr']['de-at'] = "Netzwerk Adresse"; $text['label-network_addr']['he'] = "כתובת רשת"; -<<<<<<< HEAD $text['label-mos_score']['en-us'] = "MOS Score"; $text['label-mos_score']['es-cl'] = ""; $text['label-mos_score']['pt-pt'] = ""; @@ -1233,4 +1232,4 @@ $text['button-advanced_search']['uk'] = ""; $text['button-advanced_search']['de-at'] = "Erweiterte Suche"; $text['button-advanced_search']['he'] = "חיפוש מתקדם"; -?> +?> \ No newline at end of file diff --git a/app/xml_cdr/xml_cdr_inc.php b/app/xml_cdr/xml_cdr_inc.php index 2fc5daf1f8..34c8a23321 100644 --- a/app/xml_cdr/xml_cdr_inc.php +++ b/app/xml_cdr/xml_cdr_inc.php @@ -34,9 +34,6 @@ else { exit; } -//import xml_cdr files - require_once "v_xml_cdr_import.php"; - //additional includes require_once "resources/paging.php";