[MERGE FAILED] fdo#63154: Change macros Min/Max for std::min/max

[David Tardon (via Code Review)]

David Tardon has submitted this change and it FAILED to merge.

Change subject: fdo#63154: Change macros Min/Max for std::min/max
......................................................................


Your change could not be merged due to a path conflict.

Please merge (or rebase) the change locally and upload the resolution for review.

-- 
To view, visit https://gerrit.libreoffice.org/3326
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merge-failed
Gerrit-Change-Id: I8a7233db20abdcdbb18428ad4004c78cc516a0e6
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza <marcos.souza.org at gmail.com>
Gerrit-Reviewer: Chris Sherlock <chris.sherlock79 at gmail.com>
Gerrit-Reviewer: David Tardon <dtardon at redhat.com>
Gerrit-Reviewer: Eike Rathke <erack at redhat.com>
Gerrit-Reviewer: LibreOffice gerrit bot <gerrit at libreoffice.org>
Gerrit-Reviewer: Marcos Souza <marcos.souza.org at gmail.com>
Gerrit-Reviewer: Michael Meeks <michael.meeks at suse.com>