From 9c19fb469cc0ca89e471ed5b404399e7d2c5d80e Mon Sep 17 00:00:00 2001
From: DanB <danb@cgrates.org>
Date: Sun, 12 Nov 2017 19:26:07 +0100
Subject: [PATCH] *voice balance format change into nanoseconds from seconds,
 some test fixes

---
 general_tests/ddazmbl1_test.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/general_tests/ddazmbl1_test.go b/general_tests/ddazmbl1_test.go
index f67bee41c..2ea863922 100644
--- a/general_tests/ddazmbl1_test.go
+++ b/general_tests/ddazmbl1_test.go
@@ -65,8 +65,12 @@ TOPUP10_AT,TOPUP10_AC1,ASAP,10`
 	thresholds := ``
 	filters := ``
 	lcrprofiles := ``
-	csvr := engine.NewTpReader(dataDB.DataDB(), engine.NewStringCSVStorage(',', destinations, timings, rates, destinationRates, ratingPlans, ratingProfiles,
-		sharedGroups, lcrs, actions, actionPlans, actionTriggers, accountActions, derivedCharges, cdrStats, users, aliases, resLimits, stats, thresholds, filters, lcrprofiles), "", "")
+	csvr := engine.NewTpReader(dataDB.DataDB(),
+		engine.NewStringCSVStorage(',', destinations, timings, rates,
+			destinationRates, ratingPlans, ratingProfiles,
+			sharedGroups, lcrs, actions, actionPlans, actionTriggers, accountActions,
+			derivedCharges, cdrStats, users, aliases, resLimits, stats,
+			thresholds, filters, lcrprofiles), "", "")
 	if err := csvr.LoadDestinations(); err != nil {
 		t.Fatal(err)
 	}
@@ -113,12 +117,8 @@ TOPUP10_AT,TOPUP10_AC1,ASAP,10`
 		t.Error("No account saved")
 	}
 	cache.Flush()
-<<<<<<< HEAD
 	/*
 		dataDB.LoadDataDBCache(nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil)
-=======
-	dataDB.LoadDataDBCache(nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil)
->>>>>>> LCRProfile(2)
 
 		if cachedDests := cache.CountEntries(utils.DESTINATION_PREFIX); cachedDests != 0 {
 			t.Error("Wrong number of cached destinations found", cachedDests)