From b7ebe1272c1127df290535af2430622b28160bb0 Mon Sep 17 00:00:00 2001
From: EoleDev <root@serverpc.home>
Date: Wed, 9 Mar 2016 16:16:22 +0100
Subject: Library maj

---
 server/Test/AppTestClass.php | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'server/Test')

diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php
index 4d7cab5..6685ec7 100755
--- a/server/Test/AppTestClass.php
+++ b/server/Test/AppTestClass.php
@@ -1,6 +1,15 @@
 <?php
 include_once("../core/Plugin_Api.php");
 include_once("../core/LibOverride/genTokenOptions.php");
+<<<<<<< Updated upstream
+=======
+include_once("../core/ErrorManagement.php");
+
+use OpenCloud\Common\Error\BadResponseError;
+use OpenCloud\Common\Error\BaseError;
+use OpenCloud\Common\Error\NotImplementedError;
+use OpenCloud\Common\Error\UserInputError;
+>>>>>>> Stashed changes
 
 class AppTest{
 	
-- 
cgit v1.2.3