merge

cycle_analysis/cycle_tools_coalescence.py

@@ -9,13 +9,9 @@ import networkx as nx
 import numpy as np
 import sys
 import cycle_tools_simple
-<<<<<<< HEAD
 
 
 print('release the kraken')
-=======
-print('hello beasty')
->>>>>>> dev
 class coalescence(cycle_tools_simple.simple,object):
 
     def __init__(self):