ulm         15/01/09 06:15:28

  Modified:             ChangeLog
  Log:
  Fix ChangeLog.

Revision  Changes    Path
1.9671               profiles/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/ChangeLog?rev=1.9671&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/ChangeLog?rev=1.9671&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/ChangeLog?r1=1.9670&r2=1.9671

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v
retrieving revision 1.9670
retrieving revision 1.9671
diff -u -r1.9670 -r1.9671
--- ChangeLog   8 Jan 2015 12:49:11 -0000       1.9670
+++ ChangeLog   9 Jan 2015 06:15:28 -0000       1.9671
@@ -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 <[email protected]> package.mask:
   Mask Asterisk 13 branch.
 
->>>>>>> 1.9669
   01 Jan 2015; Mikle Kolyada <[email protected]> package.mask:
   Remove obsolete dev-perl masks.
 




Reply via email to