From: Samuel Cormier-Iijima <sciyoshi@gmail.com>
Date: Fri, 29 Feb 2008 17:48:56 +0000 (-0500)
Subject: Finish merging, i suck at git
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fgnio.git;a=commitdiff_plain;h=914c20945d3f0b9460447fb2e44a493ba4debc63

Finish merging, i suck at git
---

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);