Skip to content

Commit

Permalink
Merge branch 'master' of git@github.com:JohnLato/listlike
Browse files Browse the repository at this point in the history
Conflicts:
	ListLike.cabal

Version conflict in ListLike.cabal fixed
  • Loading branch information
JohnLato committed Feb 4, 2011
2 parents efe59f8 + 786caf6 commit a4a5919
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions ListLike.cabal
@@ -1,7 +1,7 @@
Name: ListLike
Version: 1.1.1
Version: 2.0.1
License: BSD3
Maintainer: John W. Lato <jwlato@gmail.com>
Maintainer: John Lato <jwlato@gmail.com>
Author: John Goerzen
Copyright: Copyright (c) 2007-2008 John Goerzen
license-file: COPYRIGHT
Expand Down Expand Up @@ -31,7 +31,6 @@ Exposed-Modules: Data.ListLike,
Data.ListLike.Utils
-- Other-Modules: Data.ConfigFile.Lexer
Build-Depends: base >= 3 && < 5
,mtl >= 1.1.0 && < 1.2
,containers >= 0.3 && < 0.5
,bytestring >= 0.9.1 && < 0.10
,array >= 0.3 && < 0.4
Expand Down

0 comments on commit a4a5919

Please sign in to comment.