diff options
| author | jdc <jdc> | 2015-02-02 07:47:56 +0000 |
|---|---|---|
| committer | jdc <jdc> | 2015-02-02 07:47:56 +0000 |
| commit | df876a33da1e9e49ce1db93814bc66be383b1688 (patch) | |
| tree | 4d9d142e4d4b0163ebfd2e8b679aa3acc2831753 /meta-pkgs | |
| parent | 3628daa8affc825b9d4a19ff7fc4f390c55d9ce4 (diff) | |
| download | pkgsrc-df876a33da1e9e49ce1db93814bc66be383b1688.tar.gz | |
Remove conflict markers.
Diffstat (limited to 'meta-pkgs')
| -rw-r--r-- | meta-pkgs/boost/distinfo | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo index c623a3e1da1..63ff50449fa 100644 --- a/meta-pkgs/boost/distinfo +++ b/meta-pkgs/boost/distinfo @@ -1,11 +1,8 @@ -$NetBSD: distinfo,v 1.75 2015/02/02 07:47:04 jdc Exp $ +$NetBSD: distinfo,v 1.76 2015/02/02 07:47:56 jdc Exp $ SHA1 (boost_1_57_0.tar.bz2) = e151557ae47afd1b43dc3fac46f8b04a8fe51c12 RMD160 (boost_1_57_0.tar.bz2) = 8365f7c11e5ae088164ab1cb40ac624e76f8e72e Size (boost_1_57_0.tar.bz2) = 60821561 bytes -<<<<<<< distinfo -======= ->>>>>>> 1.74 SHA1 (patch-aa) = 408a63a807aaa491130db018cd89bca6a427090d SHA1 (patch-ab) = 37c61bcfc27f1533df21f4392f80df2d2dbe51ef SHA1 (patch-ac) = 32d14b50682dae1950ed927ecb9318ad6b07687a |