diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-06-16 20:47:04 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-06-16 20:47:04 +0900 |
| commit | 124fd73c7976e28e736c47f86be3fb7fb6788132 (patch) | |
| tree | 3ecbf6f48b8cd4a3b9de2b48897f6758f34f2fd8 /test/assert.rb | |
| parent | ef5087bc9ad921e35b93b9d274c35518c0d94170 (diff) | |
| parent | d8c8893e94fb10724513cf2c59d142aa5238ea2c (diff) | |
| download | mruby-124fd73c7976e28e736c47f86be3fb7fb6788132.tar.gz mruby-124fd73c7976e28e736c47f86be3fb7fb6788132.zip | |
resolve conflict
Diffstat (limited to 'test/assert.rb')
| -rw-r--r-- | test/assert.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/assert.rb b/test/assert.rb index dc282925f..98057331b 100644 --- a/test/assert.rb +++ b/test/assert.rb @@ -62,7 +62,7 @@ def assert(str = 'Assertion failed', iso = '') $asserts.push(assertion_string('Error: ', str, iso, e)) $kill_test += 1 t_print('X') - end + end ensure $mrbtest_assert = nil end |