merge conflicts

Author: Laymer

.tool-versions

@@ -41,7 +41,6 @@
 {partisan , [
     {peer_port, 27000},
     {partisan_peer_service_manager , partisan_default_peer_service_manager} ,
-    {channels , [data, control]}
     {acceptor_pool_size, 5}
 ]} ,
 

config/sys.config.src config/sys.configconfig/sys.config.src renamed to config/sys.config

@@ -86,7 +86,7 @@ <h3 class="function"><a name="clusterize-0">clusterize/0</a></h3>
 
 <h3 class="function"><a name="contagion-0">contagion/0</a></h3>
 <div class="spec">
-<p><tt>contagion() -&gt; [{error, atom()} | {ok, atom()}]</tt><br></p>
+<p><tt>contagion() -&gt; {ok, []} | {ok, [map()]}</tt><br></p>
 </div><p>Form Lasp cluster without attempting to ping neighbors beforehand.</p>
 
 <h3 class="function"><a name="declare-4">declare/4</a></h3>