projects
/
cascardo
/
gnio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Finish merging, i suck at git
[cascardo/gnio.git]
/
gnio
/
gsocket.c
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);