From 0aeb27ba9707fca4849d7698bb4f009c32a80ae6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 29 Jun 2019 23:25:07 +0200 Subject: [PATCH 1/2] Fix merge --- build/makepack-dolibarr.pl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index df58566c2d5..bf593192507 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -387,7 +387,8 @@ if ($nboftargetok) { #----------------------- if ($CHOOSEDTARGET{'-CHKSUM'}) { -<<<<<<< HEAD + chdir("$SOURCE"); + $ret=`git ls-files . --exclude-standard --others`; if ($ret) { @@ -397,9 +398,6 @@ if ($nboftargetok) { exit; } -======= - chdir("$SOURCE"); ->>>>>>> branch '8.0' of git@github.com:Dolibarr/dolibarr.git print 'Create xml check file with md5 checksum with command php '.$SOURCE.'/build/generate_filelist_xml.php release='.$MAJOR.'.'.$MINOR.'.'.$BUILD."\n"; $ret=`php $SOURCE/build/generate_filelist_xml.php release=$MAJOR.$MINOR.$BUILD`; print $ret."\n"; From 6537faa35eb00d00e6201c794e89f840a4a3beae Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 29 Jun 2019 23:26:14 +0200 Subject: [PATCH 2/2] Fix merge --- build/makepack-dolibarr.pl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index bf593192507..138c1cd21d5 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -570,10 +570,6 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/timesheet*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/webmail*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/workstation*`; -<<<<<<< HEAD -======= - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/accountingexport*`; ->>>>>>> branch '8.0' of git@github.com:Dolibarr/dolibarr.git $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/allscreen*`; # Removed other test files