From: Bart Polot <bart@net.in.tum.de>
Date: Fri, 26 Jun 2015 03:27:31 +0000 (+0000)
Subject: Merge branch 'crypto'
X-Git-Tag: initial-import-from-subversion-38251~1685
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3d510909911435a9d706978b56574aa1a2352238;p=oweals%2Fgnunet.git

Merge branch 'crypto'
---

diff --git a/src/cadet/gnunet-service-cadet_peer.h b/src/cadet/gnunet-service-cadet_peer.h
index fb0879a4b..8fefd053d 100644
--- a/src/cadet/gnunet-service-cadet_peer.h
+++ b/src/cadet/gnunet-service-cadet_peer.h
@@ -407,7 +407,6 @@ GCP_get_hello (struct CadetPeer *peer);
 void
 GCP_try_connect (struct CadetPeer *peer);
 
-
 /**
  * Notify a peer that a link between two other peers is broken. If any path
  * used that link, eliminate it.