From 9441c4a5782225e020e77e6700e6c6e4f69f6433 Mon Sep 17 00:00:00 2001
From: Danny Terweij <d.terweij@lxcenter.org>
Date: Thu, 20 Mar 2014 13:11:49 +0100
Subject: [PATCH] Fix a merge problem between 6.1.x and master.

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

diff --git a/README.md b/README.md
index 871b2be87d..7a6c543ce7 100644
--- a/README.md
+++ b/README.md
@@ -30,11 +30,7 @@ And don't forget our [forums](http://community.lxcenter.org)!
     Kloxo, Web Hosting Controlpanel
 
     Copyright (C) 2000-2009	LxLabs
-<<<<<<< HEAD
-    Copyright (C) 2009-2013	LxCenter
-=======
     Copyright (C) 2009-2014	LxCenter
->>>>>>> a4f68b0e2d4c98a76af15be0fe96efc4700d197e
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as