diff options
| author | David Waern <unknown> | 2007-07-11 21:35:45 +0000 |
|---|---|---|
| committer | David Waern <unknown> | 2007-07-11 21:35:45 +0000 |
| commit | d086d2a733fa0256f65038be8f2f6d10f5d1fcde (patch) | |
| tree | b18ca8dbfd371a02d37cea19072264f5720fb9b9 /src/Haddock/InterfaceFile.hs | |
| parent | b30f5ecfdae9dea8048c19051732b71f7633f9c9 (diff) | |
Fix conflicts
Diffstat (limited to 'src/Haddock/InterfaceFile.hs')
| -rw-r--r-- | src/Haddock/InterfaceFile.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Haddock/InterfaceFile.hs b/src/Haddock/InterfaceFile.hs index 54dc3618..9b8e0b3e 100644 --- a/src/Haddock/InterfaceFile.hs +++ b/src/Haddock/InterfaceFile.hs @@ -183,7 +183,7 @@ fromOnDiskName arr nc (pid, mod_name, occ) = let us = nsUniqs nc uniq = uniqFromSupply us - name = mkExternalName uniq mod occ noSrcLoc + name = mkExternalName uniq mod occ noSrcSpan new_cache = extendNameCache cache mod occ name in case splitUniqSupply us of { (us',_) -> |