Commit 7211e563 authored by felix's avatar felix
Browse files

merge

parent 069d4e5f
......@@ -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):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment