diff options
author | Rob Landley <rob@landley.net> | 2006-09-20 21:57:36 +0000 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2006-09-20 21:57:36 +0000 |
commit | 4ef6f647a3f971a69c599b51f917a6b74ae32a4c (patch) | |
tree | bfe7a6622b41be0738d4edea33858139abecfd3b /libbb/xconnect.c | |
parent | eb84a42fdd1d1c2e228dcd691a67b8ad5eeda026 (diff) | |
download | busybox-4ef6f647a3f971a69c599b51f917a6b74ae32a4c.tar.gz |
The version checked into the tree is a snapshot of an unifinished applet, and
you just made lots of ">>>>>>> mine" lines show up in my working copy of this.
Please don't do that again.
Diffstat (limited to 'libbb/xconnect.c')
0 files changed, 0 insertions, 0 deletions