Commit 418a9190 authored by dreixel's avatar dreixel
Browse files

Merge branch 'fix#5464' of /home/staff/magal101/repos/ghc/libraries/ghc-prim into fix#5464

Solved conflicts:
	GHC/Types.hs
parents 990b2969 60a85ba0
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment