From 6c3bb91fea92c5013507bdf4f5ac49e889e213ff Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Oct 2015 12:07:39 +0000
Subject: [PATCH] Unkonown merge difference between different directories are merged together.

---
 src/bond.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bond.c b/src/bond.c
index 4d11c97..ce255ca 100644
--- a/src/bond.c
+++ b/src/bond.c
@@ -38,9 +38,9 @@
 
 ts_bool bond_vector(ts_bond *bond){
 	
-	bond->x=bond->vtx1->x-bond->vtx2->x;
-	bond->y=bond->vtx1->y-bond->vtx2->y;
-	bond->z=bond->vtx1->z-bond->vtx2->z;
+	bond->x = bond->vtx1->x - bond->vtx2->x;
+	bond->y = bond->vtx1->y - bond->vtx2->y;
+	bond->z = bond->vtx1->z - bond->vtx2->z;
 
 	return TS_SUCCESS;	
 }

--
Gitblit v1.9.3