# Conflicts: # composer.json # copy_this/_taxRates/Models/articlePricesAbstract.php # copy_this/_taxRates/Models/genericAbstract.php # copy_this/_taxRates/Models/raiseArticlePrices.php # copy_this/_taxRates/Models/raiseTrait.php # copy_this/_taxRates/Models/reduceArticlePrices.php # copy_this/_taxRates/Models/reduceTrait.php # copy_this/_taxRates/Models/taxRateAbstract.php # copy_this/_taxRates/bin/raiseArticlePrices # copy_this/_taxRates/bin/reduceArticlePrices