fix double merge
authorDenis Vlasenko <vda.linux@googlemail.com>
Wed, 22 Nov 2006 17:42:06 +0000 (17:42 -0000)
committerDenis Vlasenko <vda.linux@googlemail.com>
Wed, 22 Nov 2006 17:42:06 +0000 (17:42 -0000)
commit81e264d4af1e5d5469f7654ebe463ed168e068ec
tree4eeb99add58df59c1462600eaaddd768283febe3
parentbe2f9f7fe07b75c0f400593a28799f7c131f1b0c
fix double merge
libbb/xconnect.c