Finish merging, i suck at git

diff --git a/gnio/gsocket.c b/gnio/gsocket.c
index d92a1d0..3b9671e 100644 (file)
--- a/gnio/gsocket.c
+++ b/gnio/gsocket.c
@@ -79,7 +79,6 @@ struct _GSocketPrivate
 };
 
 static void
-<<<<<<< HEAD:gnio/gsocket.c
 g_socket_constructed (GObject *object)
 {
   GSocket *sock = G_SOCKET (object);