diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-04-26 17:05:59 +0200 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2017-04-26 17:05:59 +0200 |
| commit | c0a8942764e30691813ba426c756c729984fdeed (patch) | |
| tree | 160a7014f2f5c81df3d7c4c4cd6685f72122d435 /lib/public/Diagnostics | |
| parent | 9fec4031b30f5ab56af2f8c284672fcd444e8b62 (diff) | |
| download | nextcloud-server-c0a8942764e30691813ba426c756c729984fdeed.tar.gz nextcloud-server-c0a8942764e30691813ba426c756c729984fdeed.zip | |
Fix missing conflict resolutions
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/public/Diagnostics')
| -rw-r--r-- | lib/public/Diagnostics/IEventLogger.php | 4 | ||||
| -rw-r--r-- | lib/public/Diagnostics/IQueryLogger.php | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/lib/public/Diagnostics/IEventLogger.php b/lib/public/Diagnostics/IEventLogger.php index 4c2ae9e3b2c..c76e96c5674 100644 --- 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 * diff --git a/lib/public/Diagnostics/IQueryLogger.php b/lib/public/Diagnostics/IQueryLogger.php index 3ab491a2751..32723a56cb9 100644 --- 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 * |