diff options
| -rw-r--r-- | sci-libs/nipy-data/ChangeLog | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/sci-libs/nipy-data/ChangeLog b/sci-libs/nipy-data/ChangeLog deleted file mode 100644 index f56e44b2c..000000000 --- a/sci-libs/nipy-data/ChangeLog +++ /dev/null @@ -1,42 +0,0 @@ -# ChangeLog for sci-libs/nipy-data -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Id$ - -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - 19 Dec 2015; Horea Christian <h.chr@mail.ru> nipy-data-0.2.ebuild: - sci-libs/nipy-data: removed unused eclasses, updated description - - 17 Dec 2015; Horea Christian <h.chr@mail.ru> nipy-data-0.2.ebuild: - sci-libs/nipy-data: no stable packages in the overlay - - 17 Dec 2015; Horea Christian <h.chr@mail.ru> nipy-data-0.2.ebuild: - sci-libs/nipy-data: removed emtpy deps - - 17 Dec 2015; Horea Christian <h.chr@mail.ru> nipy-data-0.2.ebuild: - sci-libs/nipy-data: marked package as stable - -======= ->>>>>>> 6e709b8... sci-libs/nipy-data: new package -======= -======= - 19 Dec 2015; Horea Christian <h.chr@mail.ru> nipy-data-0.2.ebuild: - sci-libs/nipy-data: removed unused eclasses, updated description - ->>>>>>> 841343a... sci-libs/nipy-data: removed unused eclasses, updated description - 17 Dec 2015; Horea Christian <h.chr@mail.ru> nipy-data-0.2.ebuild: - sci-libs/nipy-data: no stable packages in the overlay - - 17 Dec 2015; Horea Christian <h.chr@mail.ru> nipy-data-0.2.ebuild: - sci-libs/nipy-data: removed emtpy deps - - 17 Dec 2015; Horea Christian <h.chr@mail.ru> nipy-data-0.2.ebuild: - sci-libs/nipy-data: marked package as stable - ->>>>>>> f7adcb4... sci-libs/nipy-data: marked package as stable -*nipy-data-0.2 (16 Dec 2015) - - 16 Dec 2015; Horea Christian <h.chr@mail.ru> +metadata.xml, - +nipy-data-0.2.ebuild: - sci-libs/nipy-data: new package |