From c57e6958649918c8af93976df51e52c21a507499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric?= <cedric@technologisation.com>
Date: Mon, 25 Sep 2017 13:32:21 -0400
Subject: [PATCH] Copyright change

---
 README.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/README.md b/README.md
index 3589327..6159c46 100644
--- a/README.md
+++ b/README.md
@@ -62,9 +62,4 @@ See misc folder For some screenshot
  - NoVNC console integration (stuck for the moment ... :( )
 
 # License
-<<<<<<< HEAD
 Copyright (c) 2017, Oricom Internet
-=======
-Copyright (c) 2016, GodY
->>>>>>> 45069feb7d44682f700806891cf063cb5671d74a
-All rights reserved.
-- 
GitLab