diff options
| author | Max Bolingbroke <batterseapower@hotmail.com> | 2011-09-09 13:40:10 +0100 |
|---|---|---|
| committer | Max Bolingbroke <batterseapower@hotmail.com> | 2011-09-09 13:40:10 +0100 |
| commit | 09af1e9b4f8151a8b32e05ff7041cebe1edec1be (patch) | |
| tree | 90d6179e372c5197450de796c654f9cbe85f4ec5 /testsuite/tests/safeHaskell/unsafeLibs/all.T | |
| parent | 3723ffd41a728feced8ba99059253c03814689cc (diff) | |
| parent | 9857fca7e233be6206c101625a62c52266b88767 (diff) | |
| download | haskell-09af1e9b4f8151a8b32e05ff7041cebe1edec1be.tar.gz | |
Merge branch 'no-pred-ty'
Conflicts:
tests/safeHaskell/safeLanguage/all.T
tests/safeHaskell/unsafeLibs/all.T
tests/typecheck/should_compile/all.T
tests/typecheck/should_compile/tc250.hs
tests/typecheck/should_compile/tc251.hs
Diffstat (limited to 'testsuite/tests/safeHaskell/unsafeLibs/all.T')
| -rw-r--r-- | testsuite/tests/safeHaskell/unsafeLibs/all.T | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/all.T b/testsuite/tests/safeHaskell/unsafeLibs/all.T index 2e1ddb5c2e..56969dbfd7 100644 --- a/testsuite/tests/safeHaskell/unsafeLibs/all.T +++ b/testsuite/tests/safeHaskell/unsafeLibs/all.T @@ -23,5 +23,4 @@ test('BadImport02', test('BadImport03', extra_clean(['BadImport03_A.o', 'BadImport03_A.hi']), multimod_compile_fail, - ['BadImport03', '']) - + ['BadImport03', ''])
\ No newline at end of file |