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/triangle.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/triangle.h b/src/triangle.h
index a3d8184..a1a0fd0 100644
--- a/src/triangle.h
+++ b/src/triangle.h
@@ -6,5 +6,5 @@
 ts_bool triangle_add_neighbour(ts_triangle *tria, ts_triangle *ntria);
 ts_bool triangle_normal_vector(ts_triangle *tria);
 ts_bool triangle_list_free(ts_triangle_list *tlist);
-
+ts_bool triangle_remove_neighbour(ts_triangle *tria, ts_triangle *ntria);
 #endif

--
Gitblit v1.9.3