This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "snap".
The branch, master has been updated
via be5d4eeb3571cafb8ee35a55046da0fa17e26d3f (commit)
from 60b838be8aa05d176f2fff5b5a0c2dc7d946c38b (commit)
Summary of changes:
snap.cabal | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit be5d4eeb3571cafb8ee35a55046da0fa17e26d3f
Author: Gregory Collins <[email protected]>
Date: Sat Jan 15 14:22:56 2011 +0100
Accidentally committed merge boundary, oooooppppspsppspsp
diff --git a/snap.cabal b/snap.cabal
index 1ae1c2a..0c8ebd4 100644
--- a/snap.cabal
+++ b/snap.cabal
@@ -54,11 +54,7 @@ Library
enumerator == 0.4.*,
filepath >= 1.1 && <1.3,
MonadCatchIO-transformers >= 0.2.1 && < 0.3,
-<<<<<<< HEAD
snap-core == 0.4.*,
-=======
- snap-core >= 0.3.1 && <0.4,
->>>>>>> 2190658855219af53a6089bb9ec7f7749f5414e0
heist >= 0.4 && < 0.5,
hint >= 0.3.3.1 && < 0.4,
template-haskell >= 2.3 && < 2.6,
-----------------------------------------------------------------------
hooks/post-receive
--
snap
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
