Skip to content

Commit

Permalink
Merge branch 'wip-MDL-55418-m31' of https://github.com/marinaglancy/m…
Browse files Browse the repository at this point in the history
…oodle into MOODLE_31_STABLE
  • Loading branch information
danpoltawski committed Aug 8, 2016
2 parents 741d8ab + 174b641 commit 50b5467
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Expand Up @@ -26,7 +26,7 @@
require_once(__DIR__ . '/../../../../../lib/behat/behat_base.php');

use Behat\Gherkin\Node\TableNode as TableNode;
use Behat\Behat\Exception\PendingException as PendingException;
use Behat\Behat\Tester\Exception\PendingException as PendingException;
use core_competency\competency;
use core_competency\competency_framework;
use core_competency\plan;
Expand Down
2 changes: 1 addition & 1 deletion lib/tests/behat/behat_data_generators.php
Expand Up @@ -28,7 +28,7 @@
require_once(__DIR__ . '/../../behat/behat_base.php');

use Behat\Gherkin\Node\TableNode as TableNode;
use Behat\Behat\Exception\PendingException as PendingException;
use Behat\Behat\Tester\Exception\PendingException as PendingException;

/**
* Class to set up quickly a Given environment.
Expand Down

0 comments on commit 50b5467

Please sign in to comment.