Fix missing conflict resolutions
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
parent
9fec4031b3
commit
c0a8942764
|
@ -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
|
||||
*
|
||||
|
|
Loading…
Reference in New Issue