From 5b00ba11fd0bd3fe0628b12e7fed2ad36c319dd7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 May 2015 16:54:54 +0200
Subject: [PATCH] Prepare packaging

---
 build/exe/doliwamp/doliwamp.iss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index c90bda912b6..8d465cc4cbf 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -32,11 +32,7 @@ AppPublisherURL=http://www.nltechno.com
 AppSupportURL=http://www.dolibarr.org
 AppUpdatesURL=http://www.dolibarr.org
 AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql softwares.
-<<<<<<< HEAD
-AppCopyright=Copyright (C) 2008-2014 Laurent Destailleur, NLTechno
-=======
 AppCopyright=Copyright (C) 2008-2015 Laurent Destailleur, NLTechno
->>>>>>> refs/remotes/origin/3.5
 DefaultDirName=c:\dolibarr
 DefaultGroupName=Dolibarr
 ;LicenseFile=COPYING