From 024167e2030fa91b3056425f1472616266b08951 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Mon, 2 Feb 2015 18:34:58 +0100
Subject: [PATCH] Fix merge issue

See 94220501822dbc301831afa1e50cd53659020cf9
---
 .../package/validation/PackageValidationManager.class.php       | 2 ++
 1 file changed, 2 insertions(+)

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 @@
 <?php
 namespace wcf\system\package\validation;
+use wcf\data\package\installation\plugin\PackageInstallationPluginList;
 use wcf\data\package\Package;
+use wcf\system\package\PackageArchive;
 use wcf\system\SingletonFactory;
 
 /**
-- 
2.20.1