Browse Source
Fix missing conflict resolutions
Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/4515/head
Joas Schilling
9 years ago
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
3 changed files with
0 additions and
12 deletions
-
lib/private/Diagnostics/QueryLogger.php
-
lib/public/Diagnostics/IEventLogger.php
-
lib/public/Diagnostics/IQueryLogger.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 |
|
|
|
* |
|
|
|
|
|
|
|
@ -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 |
|
|
|
* |
|
|
|
|
|
|
|
@ -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 |
|
|
|
* |
|
|
|
|
