diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-31 16:48:45 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-31 16:48:45 +0100 |
| commit | 38136c7702e1940a88f24d09141f07b23b966a1c (patch) | |
| tree | b1ba1e95441ce11b8ed84dc3810c7481df26ef92 /package/base-files/Makefile | |
| parent | 50e7ffe10d0bca1ef5b2d27ebc518b456035a18d (diff) | |
| parent | 2dce122bacb8837543ff8e882a1df7284324e357 (diff) | |
resolve conflict
Diffstat (limited to 'package/base-files/Makefile')
| -rw-r--r-- | package/base-files/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 1b8bf812a..369d8f485 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 41 +PKG_RELEASE:= 42 PKG_SECTION:= base PKG_DESCR:= basic files and scripts |