Fix conflicts
Showing
- haddock.cabal 10 additions, 1 deletionhaddock.cabal
- src/Haddock/Html.hs 1 addition, 1 deletionsrc/Haddock/Html.hs
- src/Haddock/InterfaceFile.hs 1 addition, 1 deletionsrc/Haddock/InterfaceFile.hs
- src/Haddock/Rename.hs 1 addition, 1 deletionsrc/Haddock/Rename.hs
- src/Haddock/Types.hs 1 addition, 1 deletionsrc/Haddock/Types.hs
- src/Haddock/Version.hs 2 additions, 2 deletionssrc/Haddock/Version.hs
- src/Main.hs 4 additions, 5 deletionssrc/Main.hs
Loading
Please register or sign in to comment