Merge branch 'master' into usb-lock-offusb-lock-off

1 files changed, 44 insertions, 0 deletions

diff --git a/modules-available/locationinfo/exchange-includes/jamesiarmes/PhpEws/Enumeration/ConflictResolutionType.php b/modules-available/locationinfo/exchange-includes/jamesiarmes/PhpEws/Enumeration/ConflictResolutionType.php
new file mode 100644
index 00000000..f792ab62
--- /dev/null
+++ b/modules-available/locationinfo/exchange-includes/jamesiarmes/PhpEws/Enumeration/ConflictResolutionType.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Contains \jamesiarmes\PhpEws\Enumeration\ConflictResolutionType.
+ */
+
+namespace jamesiarmes\PhpEws\Enumeration;
+
+use \jamesiarmes\PhpEws\Enumeration;
+
+/**
+ * Defines the type of conflict resolution to try during an update.
+ *
+ * @package php-ews\Enumeration
+ */
+class ConflictResolutionType extends Enumeration
+{
+    /**
+     * If there is a conflict, the update operation will overwrite information.
+     *
+     * @since Exchange 2007
+     *
+     * @var string
+     */
+    const ALWAYS_OVERWRITE = 'AlwaysOverwrite';
+
+    /**
+     * The update operation automatically resolves any conflict.
+     *
+     * @since Exchange 2007
+     *
+     * @var string
+     */
+    const AUTO_RESOLVE = 'AutoResolve';
+
+    /**
+     * If there is a conflict, the update operation fails and an error is
+     * returned.
+     *
+     * @since Exchange 2007
+     *
+     * @var string
+     */
+    const NEVER_OVERWRITE = 'NeverOverwrite';
+}