Copyright change

c57e6958 · Cédric · d5d91982 · c57e6958
Commit c57e6958 authored Sep 25, 2017 by Cédric
--- 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.