aboutsummaryrefslogtreecommitdiff
path: root/libobjc/sendmsg.c
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@gcc.gnu.org>2011-05-26 08:53:05 +0000
committerEric Botcazou <ebotcazou@gcc.gnu.org>2011-05-26 08:53:05 +0000
commit1651e703484940d8ea0fd098c28b25c5b0e2f862 (patch)
treedc69365b5b5d6ad4c3b7d712e3e5a3ab9a3ddf5b /libobjc/sendmsg.c
parent50fed7bf1a09778cc0cc75e270f2092cb71690da (diff)
downloadgcc-1651e703484940d8ea0fd098c28b25c5b0e2f862.zip
gcc-1651e703484940d8ea0fd098c28b25c5b0e2f862.tar.gz
gcc-1651e703484940d8ea0fd098c28b25c5b0e2f862.tar.bz2
Remove conflict marker
From-SVN: r174267
Diffstat (limited to 'libobjc/sendmsg.c')
0 files changed, 0 insertions, 0 deletions