lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Laurent Destailleur 2019-06-29 23:26:14 +02:00
parent 0aeb27ba97
commit 6537faa35e
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/makepack-dolibarr.pl
View File

@ -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