diff options
| author | wiz <wiz> | 2013-09-15 17:33:20 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2013-09-15 17:33:20 +0000 |
| commit | 2f6b6c93684c993ebcae79d63d40072eefe5613d (patch) | |
| tree | c22ad7166948bdc30bcfe862dd5a69e1a925231d /doc | |
| parent | d8a465baf898bb4324d1653b0bd87632c0fabbb9 (diff) | |
| download | pkgsrc-2f6b6c93684c993ebcae79d63d40072eefe5613d.tar.gz | |
Remove conflict.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/CHANGES-2013 | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/doc/CHANGES-2013 b/doc/CHANGES-2013 index e9ff4f91eb8..a41832a3f78 100644 --- a/doc/CHANGES-2013 +++ b/doc/CHANGES-2013 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2013,v 1.3533 2013/09/15 17:32:52 wiz Exp $ +$NetBSD: CHANGES-2013,v 1.3534 2013/09/15 17:33:20 wiz Exp $ Changes to the packages collection and infrastructure in 2013: @@ -4978,13 +4978,9 @@ Changes to the packages collection and infrastructure in 2013: Added www/ruby-http-cookie version 1.0.2 [taca 2013-09-15] Added misc/ruby-colorator version 0.1 [taca 2013-09-15] Updated www/ruby-pygments.rb to 0.5.2 [taca 2013-09-15] -<<<<<<< CHANGES-2013 - Updated devel/meld to 1.8.0 [wiz 2013-09-15] -======= Updated www/ruby-jekyll to 1.2.0 [taca 2013-09-15] Updated www/ruby-jquery-rails to 3.0.4 [taca 2013-09-15] Updated www/ruby-liquid to 2.5.2 [taca 2013-09-15] ->>>>>>> 1.3529 Updated devel/meld to 1.8.0 [wiz 2013-09-15] Updated textproc/py-lxml to 3.2.3 [wiz 2013-09-15] Updated devel/py-setuptools to 1.1.5 [wiz 2013-09-15] |