From 914c20945d3f0b9460447fb2e44a493ba4debc63 Mon Sep 17 00:00:00 2001
From: Samuel Cormier-Iijima <sciyoshi@gmail.com>
Date: Fri, 29 Feb 2008 12:48:56 -0500
Subject: [PATCH] Finish merging, i suck at git

---
 gnio/gsocket.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gnio/gsocket.c b/gnio/gsocket.c
index d92a1d0..3b9671e 100644
--- 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);
-- 
2.20.1