diff options
author | Thomas Steur <thomas.steur@gmail.com> | 2016-08-31 16:13:54 +0300 |
---|---|---|
committer | Thomas Steur <thomas.steur@gmail.com> | 2016-08-31 16:13:54 +0300 |
commit | 4617d4205cdf646a52ef1886d9240e9c2bad0609 (patch) | |
tree | 849ee39219166830170513e6b00161d3e5864514 /tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv | |
parent | 903b870466b62e8a655a0f6564d052583c0fb7ec (diff) | |
parent | 5d52b777100f5acb82d16e947e0e9ab2c0804215 (diff) |
Merge branch '3.x-dev' into 3.0-m06
Conflicts:
js/piwik.min.js
piwik.js
Diffstat (limited to 'tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv')
-rw-r--r-- | tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv index b3855b3029..ad3603d5f9 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv @@ -17,16 +17,16 @@ VisitorType,5,16,$ 13361.11,3.2,00:22:49,20% VisitorName,4,12,$ 13351.11,3,00:25:32,25% Device type -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Desktop,5,16,80%,3.2,00:22:49,20% +label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate +Desktop,5,16,$ 250,3.2,00:22:49,20% Device model -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,5,16,80%,3.2,00:22:49,20% +label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,5,16,$ 13361.11,3.2,00:22:49,20% Device brand -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,5,16,80%,3.2,00:22:49,20% +label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,5,16,$ 13361.11,3.2,00:22:49,20% Screen Resolution label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate |