diff options
author | Ron Yorston <rmy@pobox.com> | 2015-07-14 14:12:05 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2015-07-14 14:12:05 +0100 |
commit | 895a1533781ca4713ef92113ab6ac5f2584ddd9d (patch) | |
tree | 49c8602e9cd733e6f6c105e94e614b8236677853 /shell/shell_common.c | |
parent | 535ec990c50206697852d5c25e94a959f24d86bc (diff) | |
parent | 072fc60f29ee3a4ff38f095a9ef149b2e820c8c0 (diff) | |
download | busybox-w32-895a1533781ca4713ef92113ab6ac5f2584ddd9d.tar.gz busybox-w32-895a1533781ca4713ef92113ab6ac5f2584ddd9d.tar.bz2 busybox-w32-895a1533781ca4713ef92113ab6ac5f2584ddd9d.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'shell/shell_common.c')
-rw-r--r-- | shell/shell_common.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/shell/shell_common.c b/shell/shell_common.c index 2244a3c97..1567d1de4 100644 --- a/shell/shell_common.c +++ b/shell/shell_common.c | |||
@@ -500,7 +500,6 @@ shell_builtin_ulimit(char **argv) | |||
500 | /* bad option. getopt already complained. */ | 500 | /* bad option. getopt already complained. */ |
501 | break; | 501 | break; |
502 | } | 502 | } |
503 | |||
504 | } /* while (there are options) */ | 503 | } /* while (there are options) */ |
505 | 504 | ||
506 | return 0; | 505 | return 0; |