Fix missing conflict resolutions

Signed-off-by: Joas Schilling <coding@schilljs.com>
9 years ago · c0a8942764
parent 9fec4031b3
commit c0a8942764
3 changed files with 0 additions and 12 deletions
--- a/lib/private/Diagnostics/QueryLogger.php
+++ b/lib/private/Diagnostics/QueryLogger.php
@ -3,13 +3,9 @@
 * @copyright Copyright (c) 2016, ownCloud, Inc.
 *
 * @author Morris Jobke <hey@morrisjobke.de>
-<<<<<<< HEAD
 * @author Robin Appelman <robin@icewind.nl>
-=======
- * @author Robin Appelman <icewind@owncloud.com>
 * @author Thomas Müller <thomas.mueller@tmit.eu>
 * @author Piotr Mrowczynski <piotr@owncloud.com>
->>>>>>> a5095447b7... Adjust query/event logging code in favour of more complex owncloud/diagnostics (#27643)
 *
 * @license AGPL-3.0
 *
--- a/lib/public/Diagnostics/IEventLogger.php
+++ b/lib/public/Diagnostics/IEventLogger.php
@ -3,12 +3,8 @@
 * @copyright Copyright (c) 2016, ownCloud, Inc.
 *
 * @author Morris Jobke <hey@morrisjobke.de>
-<<<<<<< HEAD
 * @author Robin Appelman <robin@icewind.nl>
-=======
- * @author Robin Appelman <icewind@owncloud.com>
 * @author Piotr Mrowczynski <piotr@owncloud.com>
->>>>>>> a5095447b7... Adjust query/event logging code in favour of more complex owncloud/diagnostics (#27643)
 *
 * @license AGPL-3.0
 *
--- a/lib/public/Diagnostics/IQueryLogger.php
+++ b/lib/public/Diagnostics/IQueryLogger.php
@ -3,12 +3,8 @@
 * @copyright Copyright (c) 2016, ownCloud, Inc.
 *
 * @author Morris Jobke <hey@morrisjobke.de>
-<<<<<<< HEAD
 * @author Robin Appelman <robin@icewind.nl>
-=======
- * @author Robin Appelman <icewind@owncloud.com>
 * @author Piotr Mrowczynski <piotr@owncloud.com>
->>>>>>> a5095447b7... Adjust query/event logging code in favour of more complex owncloud/diagnostics (#27643)
 *
 * @license AGPL-3.0
 *