Unkonown merge difference between different directories are merged together.

Samo Penic

2015-10-06 6c3bb91fea92c5013507bdf4f5ac49e889e213ff

 src/bond.h

@@ -20,6 +20,7 @@
 */
ts_bond *bond_add(ts_bond_list *blist, ts_vertex *vtx1, ts_vertex *vtx2);

ts_bool bond_vector(ts_bond *bond);
ts_bool bond_list_free(ts_bond_list *blist);