From 98eb2be2488f4ea47d60c029d95e715f30faf42a Mon Sep 17 00:00:00 2001 From: TeoV Date: Mon, 3 Jun 2019 11:21:00 +0300 Subject: [PATCH] Resolve merge problems --- cdrc/csv_test.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cdrc/csv_test.go b/cdrc/csv_test.go index 4168d0d74..5cf16cf40 100644 --- a/cdrc/csv_test.go +++ b/cdrc/csv_test.go @@ -88,12 +88,6 @@ func TestCsvDataMultiplyFactor(t *testing.T) { } csvProcessor := &CsvRecordsProcessor{dfltCdrcCfg: cdrcConfig, cdrcCfgs: []*config.CdrcCfg{cdrcConfig}, filterS: filterS} cdrRow := []string{"*data", "1"} - rtCdr, err := csvProcessor.recordToStoredCdr(cdrRow, cdrcConfig, "cgrates.org") - if err != nil { - t.Error("Failed to parse CDR in rated cdr", err) - } - // var sTime time.Time - var sTime time.Time expectedCdr := &engine.CDR{ CGRID: utils.Sha1("", "0.0.0.0"), ToR: cdrRow[0],