diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-07 20:12:57 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-07 20:12:57 +0100 |
| commit | 2bbfadac526c7880720e518e0fdd84ac0ca601bd (patch) | |
| tree | 5d7ca7982b47e2fe7ea4ef6ed5f461f3ffce83d7 /package/base-files | |
| parent | 6daa792eab1488d013fefc5eb7e4d01f40f38687 (diff) | |
| parent | 2e44499238125dbecbbf17222496ebba315cc90c (diff) | |
resolve conflicts
Diffstat (limited to 'package/base-files')
| -rwxr-xr-x | package/base-files/src/sbin/adkupdate (renamed from package/base-files/src/sbin/update) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/package/base-files/src/sbin/update b/package/base-files/src/sbin/adkupdate index d41e23a0f..d41e23a0f 100755 --- a/package/base-files/src/sbin/update +++ b/package/base-files/src/sbin/adkupdate |