From: Ulrich Müller <ulm@gentoo.org>
Date: Fri, 9 Jan 2015 06:15:28 +0000 (+0000)
Subject: Fix ChangeLog.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d98adcbc990675b1c3abf6eb5ceee5af23fd3664;p=gentoo.git

Fix ChangeLog.
---

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index b1ba13887176..e7920fcf26aa 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9670 2015/01/08 12:49:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9671 2015/01/09 06:15:28 ulm Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
@@ -31,7 +31,6 @@
   05 Jan 2015; Tony Vroon <chainsaw@gentoo.org> package.mask:
   Mask Asterisk 13 branch.
 
->>>>>>> 1.9669
   01 Jan 2015; Mikle Kolyada <zlogene@gentoo.org> package.mask:
   Remove obsolete dev-perl masks.