From: Matthias Schmidt Date: Mon, 2 Feb 2015 17:34:58 +0000 (+0100) Subject: Fix merge issue X-Git-Tag: 2.1.0_Beta_4~3 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=024167e2030fa91b3056425f1472616266b08951;p=GitHub%2FWoltLab%2FWCF.git Fix merge issue See 94220501822dbc301831afa1e50cd53659020cf9 --- diff --git a/wcfsetup/install/files/lib/system/package/validation/PackageValidationManager.class.php b/wcfsetup/install/files/lib/system/package/validation/PackageValidationManager.class.php index fddb3d19b0..274cc9e207 100644 --- a/wcfsetup/install/files/lib/system/package/validation/PackageValidationManager.class.php +++ b/wcfsetup/install/files/lib/system/package/validation/PackageValidationManager.class.php @@ -1,6 +1,8 @@