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-server".
The branch, master has been updated
via ce603fd59f04ba7592aa8825f8f6ff5a60c7aa0c (commit)
from 41012622295df3b6a7b024b0ddd5826087c29b67 (commit)
Summary of changes:
snap-server.cabal | 5 -----
1 files changed, 0 insertions(+), 5 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 ce603fd59f04ba7592aa8825f8f6ff5a60c7aa0c
Author: Gregory Collins <[email protected]>
Date: Sun Oct 10 21:53:02 2010 +0200
Fix busted merge
diff --git a/snap-server.cabal b/snap-server.cabal
index ac77bfe..533c3cb 100644
--- a/snap-server.cabal
+++ b/snap-server.cabal
@@ -123,12 +123,7 @@ Library
murmur-hash >= 0.1 && < 0.2,
network == 2.2.1.*,
old-locale,
-<<<<<<< HEAD
- snap-core == 0.2.14,
-=======
snap-core >= 0.3 && <0.4,
- snap-core >= 0.2.12 && <0.3,
->>>>>>> b56dbddec26af37aac066b40abdb3551e26ec71b
template-haskell,
time,
transformers,
-----------------------------------------------------------------------
hooks/post-receive
--
snap-server
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
