[Pkg-haskell-commits] [package-plan] 02/02: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-haskell/package-plan

[Joachim Breitner]

This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to branch master
in repository package-plan.

commit f287385bcf1c3096597c0ee22312e05e75b1de07
Merge: c64ef75 90b5f98
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sun Jun 21 20:19:38 2015 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-haskell/package-plan
    
    Conflicts:
    	packages.txt

 lts.config   | 38 +++++++++++++++++++-------------------
 packages.txt | 42 +++++++++++++++++++++---------------------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --cc packages.txt
index a755a10,6203bbe..97c718b
--- a/packages.txt
+++ b/packages.txt
@@@ -140,7 -140,7 +140,7 @@@ crypto-conduit 0.5.
  cryptohash 0.11.6
  cryptohash-conduit 0.1.1
  cryptohash-cryptoapi 0.1.3
- cryptonite 0.2 key # future dependency of tls
 -cryptonite 0.4
++cryptonite 0.4 key # future dependency of tls
  crypto-numbers 0.2.7
  crypto-pubkey 0.2.8
  crypto-pubkey-openssh 0.2.7 notest

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git