Merge branch 'MDL-65601_master' of git://github.com/dmonllao/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 16 May 2019 05:23:22 +0000 (13:23 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 16 May 2019 05:25:44 +0000 (13:25 +0800)
1  2 
analytics/classes/model.php
analytics/tests/analysis_test.php

Simple merge
@@@ -24,6 -24,8 +24,8 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
 -require_once(__DIR__ . '/../../analytics/tests/fixtures/test_timesplitting_upcoming_seconds.php');
++require_once(__DIR__ . '/fixtures/test_timesplitting_upcoming_seconds.php');
  /**
   * Unit tests for the analysis class.
   *