diff options
| author | Vlad Glagolev | 2015-12-24 10:58:26 +0300 |
|---|---|---|
| committer | Vlad Glagolev | 2015-12-24 10:58:26 +0300 |
| commit | 250861d0ab7562aad3d22a045a4cddfbf07d578c (patch) | |
| tree | e99b7df0f7eb6795fd8c5890bf8245b75d4df442 /ChangeLog | |
| parent | 76cf94254fc27542b247e9e2cfbc2f0c3047cecb (diff) | |
fixed post-conflict state in ChangeLog
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -550,7 +550,6 @@ 2015-07-28 Treeve Jelbert <treeve@sourcemage.org> * kde4-multimedia/dragon: spell deprecated [replaced by kde5-mm/dragon] -<<<<<<< HEAD 2015-07-28 Treeve Jelbert <treeve@sourcemage.org> * kde4-lts/kdepim: spell deprecated [replaced by kde5-pim/kdepim] * kde5-pim/*: added @@ -565,10 +564,9 @@ 2015-07-28 Treeve Jelbert <treeve@sourcemage.org> * kde4-support/akonadi: spell deprecated [replaced by dke5-pim/akonadi] -======= + 2015-07-28 Ismael Luceno <ismael@sourcemage.org> * graphics-libs/libpng12: new spell, copied from libpng 1.2.52 spell ->>>>>>> origin/master 2015-07-24 Vlad Glagolev <stealth@sourcemage.org> * http/palemoon: new spell, Open Source, Firefox-based web browser |