From 1d1f5861495fc6e07d8a683ca8dbbaa43936b212 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Dec 2016 13:43:15 +0000
Subject: [PATCH] Fixes conflicts after merge

---
 src/frame.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/frame.h b/src/frame.h
index b0e451c..fbd0a78 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -1,3 +1,4 @@
+/* vim: set ts=4 sts=4 sw=4 noet : */
 #ifndef _H_FRAME
 #define _H_FRAME
 ts_bool centermass(ts_vesicle *vesicle);

--
Gitblit v1.9.3