diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-11-11 13:33:16 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-11-11 13:33:16 +0100 |
| commit | 8f7d3d2fccc097c85cc403b58df6c5fc35418579 (patch) | |
| tree | 5bc1ef2a75abb0d85a3ab2cece365eed9e516470 /tests/codeigniter/core/URI_test.php | |
| parent | 4f50256a84e8052fc3356683f28286d36f8a322c (diff) | |
| parent | 81c934729d9fcbb294a8914608c315eed30ff9c4 (diff) | |
Fix merge conflicts
Diffstat (limited to 'tests/codeigniter/core/URI_test.php')
| -rw-r--r-- | tests/codeigniter/core/URI_test.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/codeigniter/core/URI_test.php b/tests/codeigniter/core/URI_test.php index 6589c1f5a..b05a385d6 100644 --- a/tests/codeigniter/core/URI_test.php +++ b/tests/codeigniter/core/URI_test.php @@ -11,7 +11,7 @@ class URI_test extends CI_TestCase { /* As of the following commit, _set_uri_string() is a protected method: - https://github.com/EllisLab/CodeIgniter/commit/d461934184d95b0cfb2feec93f27b621ef72a5c2 + https://github.com/bcit-ci/CodeIgniter/commit/d461934184d95b0cfb2feec93f27b621ef72a5c2 public function test_set_uri_string() { |