diff options
author | landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-09-20 21:57:36 +0000 |
---|---|---|
committer | landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-09-20 21:57:36 +0000 |
commit | c9d960a4afbb9dab6442c1a1d004a688d4553649 (patch) | |
tree | bfe7a6622b41be0738d4edea33858139abecfd3b /init | |
parent | f06080266cb6203e9d395c595cd564d2a168d14e (diff) | |
download | busybox-w32-c9d960a4afbb9dab6442c1a1d004a688d4553649.tar.gz busybox-w32-c9d960a4afbb9dab6442c1a1d004a688d4553649.tar.bz2 busybox-w32-c9d960a4afbb9dab6442c1a1d004a688d4553649.zip |
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.
git-svn-id: svn://busybox.net/trunk/busybox@16166 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions