Skip to content

Commit

Permalink
Merge branch 'master' of http://github.com/substack/hsopenid
Browse files Browse the repository at this point in the history
Conflicts:
	openid.cabal
  • Loading branch information
elliottt committed Sep 20, 2010
2 parents 87bdec3 + 50e3c34 commit 38915c9
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 149 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -0,0 +1 @@
dist
41 changes: 0 additions & 41 deletions examples/easy.hs

This file was deleted.

3 changes: 1 addition & 2 deletions openid.cabal
@@ -1,5 +1,5 @@
name: openid
version: 0.1.4.6
version: 0.1.5.0
cabal-version: >= 1.6
synopsis: An implementation of the OpenID-2.0 spec.
description: An implementation of the OpenID-2.0 spec.
Expand Down Expand Up @@ -47,7 +47,6 @@ library
Network.OpenID.Normalization,
Network.OpenID.Types,
Network.OpenID.Utils,
Network.OpenID.Easy,
Text.XRDS
other-modules: Network.OpenID.SSL
ghc-options: -W
Expand Down
106 changes: 0 additions & 106 deletions src/Network/OpenID/Easy.hs

This file was deleted.

0 comments on commit 38915c9

Please sign in to comment.