sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix missing conflict resolutions 

Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/4515/head
Joas Schilling 2017-04-26 17:05:59 +07:00
parent 9fec4031b3
commit c0a8942764
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
3 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/Diagnostics/QueryLogger.php
Unescape Escape View File

@ -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
*

4
lib/public/Diagnostics/IEventLogger.php
Unescape Escape View File

@ -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
*

4
lib/public/Diagnostics/IQueryLogger.php
Unescape Escape View File

@ -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
*