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

---
 COPYING |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/COPYING b/COPYING
index e22e233..9b5e620 100644
--- a/COPYING
+++ b/COPYING
@@ -1 +1,3 @@
-The original authors need to set copying rules.
+Distributed under GPLv3. See LICENSE file for details.
+
+The Authors.

--
Gitblit v1.9.3