Update to 1.5.99.11

Changes:
- Fix 3 way merge
- Properly apply credentials on merged files (@config)
This commit is contained in:
Baptiste Daroussin 2015-08-30 18:23:02 +00:00
parent a67de23e61
commit ba11c55ba7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=395633
2 changed files with 3 additions and 3 deletions

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pkg
DISTVERSION= 1.5.99.10
DISTVERSION= 1.5.99.11
_PKG_VERSION= ${DISTVERSION}
CATEGORIES= ports-mgmt
MASTER_SITES= \

View File

@ -1,2 +1,2 @@
SHA256 (pkg-1.5.99.10.tar.xz) = dcec7917ae54122c0b8afea84aeb607e17eaca67c6357b6ab6beaf8643754bdf
SIZE (pkg-1.5.99.10.tar.xz) = 1930384
SHA256 (pkg-1.5.99.11.tar.xz) = 28019d5a5d25356900d6990a7258965a04c6f851f66ca5468a573585e2675724
SIZE (pkg-1.5.99.11.tar.xz) = 1925948