[evolution-data-server/wip/mcrha/libical-glib] Change a bit a developer comment of e_cal_util_operation_flags_to_conflict_resolution()

[Milan Crha <mcrha src gnome org>]

commit 7148c513db0b014d4bb3246e4676c407b16a38e7
Author: Milan Crha <mcrha redhat com>
Date:   Wed Apr 10 23:00:14 2019 +0200

    Change a bit a developer comment of e_cal_util_operation_flags_to_conflict_resolution()

 src/calendar/libecal/e-cal-util.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/calendar/libecal/e-cal-util.c b/src/calendar/libecal/e-cal-util.c
index 27ac4120c..1316f955c 100644
--- a/src/calendar/libecal/e-cal-util.c
+++ b/src/calendar/libecal/e-cal-util.c
@@ -2627,9 +2627,9 @@ e_cal_util_operation_flags_to_conflict_resolution (guint32 flags)
  * @conflict_resolution: an #EConflictResolution
  *
  * Encodes the #EConflictResolution into the bit-or of #ECalOperationFlags.
- * The returned value can be bit-or-ed into other #ECalOperationFlags value.
+ * The returned value can be bit-or-ed with other #ECalOperationFlags values.
  *
- * Returns: a bit-or #ECalOperationFlags corresponding to the @conflict_resolution
+ * Returns: a bit-or of #ECalOperationFlags, corresponding to the @conflict_resolution
  *
  * Since: 3.36
  **/