[glib/mcatanzaro/rehandshake: 5/6] Sync GDtlsConnection handshake docs with GTlsConnection

[Michael Catanzaro <mcatanzaro src gnome org>]

commit ec45b6d8d91805147eaf99775625e2944773c78d
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Thu Jan 2 20:24:30 2020 -0600

    Sync GDtlsConnection handshake docs with GTlsConnection
    
    Sadly, I forgot to update the documentation of
    g_dtls_connection_handshake() last time I touched
    g_tls_connection_handshake().

 gio/gdtlsconnection.c | 6 ++++++
 1 file changed, 6 insertions(+)
---
diff --git a/gio/gdtlsconnection.c b/gio/gdtlsconnection.c
index 6da6d3bd6..532d2f1f5 100644
--- a/gio/gdtlsconnection.c
+++ b/gio/gdtlsconnection.c
@@ -691,8 +691,14 @@ G_GNUC_END_IGNORE_DEPRECATIONS
  *
  * On the client side, it is never necessary to call this method;
  * although the connection needs to perform a handshake after
+<<<<<<< HEAD
  * connecting, #GDtlsConnection will handle this for you automatically
  * when you try to send or receive data on the connection. You can call
+=======
+ * connecting (or after sending a "STARTTLS"-type command),
+ * #GDtlsConnection will handle this for you automatically when you try
+ * to send or receive data on the connection. You can call
+>>>>>>> 682addc2f... Sync GDtlsConnection handshake docs with GTlsConnection
  * g_dtls_connection_handshake() manually if you want to know whether
  * the initial handshake succeeded or failed (as opposed to just
  * immediately trying to use @conn to read or write, in which case,