diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
| commit | 4dc2822fa71e8e3d3ab004c8c14867607bb4de06 (patch) | |
| tree | 21e5b36849ea23f526cc58578a540de3882d7376 /package/autoconf/Makefile | |
| parent | 8f1eff09d5706cbea36ddf1bfc4661579f688853 (diff) | |
| parent | 38910b0bc0393c60da90e1b2540e3d4c5858dae9 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/autoconf/Makefile')
| -rw-r--r-- | package/autoconf/Makefile | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/package/autoconf/Makefile b/package/autoconf/Makefile index b7517b3b3..3e40e7a15 100644 --- a/package/autoconf/Makefile +++ b/package/autoconf/Makefile @@ -4,15 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= autoconf -<<<<<<< HEAD -PKG_VERSION:= 2.64 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 30a198cef839471dd4926e92ab485361 -======= PKG_VERSION:= 2.65 PKG_RELEASE:= 1 PKG_MD5SUM:= 46cfb40e0babf4c64f8325f03da81c9b ->>>>>>> 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a PKG_DESCR:= GNU autoconf PKG_SECTION:= utils PKG_URL:= http://www.gnu.org/software/autoconf/ |