Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
e41897e7
Commit
e41897e7
authored
Jun 26, 2014
by
tibbe
Browse files
Fixed botched merge
parent
196ecdee
Changes
1
Hide whitespace changes
Inline
Side-by-side
Cabal/Cabal.cabal
View file @
e41897e7
name: Cabal
<<<<<<< HEAD
version: 1.21.0.0
=======
version: 1.20.0.1
>>>>>>> 1.20
copyright: 2003-2006, Isaac Jones
2005-2011, Duncan Coutts
license: BSD3
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment