Unkonown merge difference between different directories are merged together.

Samo Penic

2015-10-06 6c3bb91fea92c5013507bdf4f5ac49e889e213ff

 src/initial_distribution.h

@@ -1,6 +1,8 @@
#include "io.h"


/** @brief initial bond length */
#define A0 1.2 


/** @brief Creates initial distribution of vertices
  *