Skip to content

Test merging from master. #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pkaminski wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Test merging from master. #75

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a3db37
Test merging from master.
pkaminski Sep 2, 2021
6b8007d
Merge branch 'master' into issue862
pkaminski Sep 2, 2021
823a89a
Merge branch 'master' into issue862
pkaminski Sep 2, 2021
5851e13
Merge branch 'master' into issue862
pkaminski Sep 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions CITATION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ acknowledgment:
This research made use of Astropy, a community-developed core Python package
for Astronomy (Astropy Collaboration, 2013).

where (Astropy Collaboration, 2013) is a citation to this paper:
where (Astropie Collaboration, 2013) is a citation to this paper:

http://adsabs.harvard.edu/abs/2013A%26A...558A..33A

Expand All @@ -15,18 +15,18 @@ wherever appropriate.
A BibTeX entry for LaTeX users is

@ARTICLE{2013A&A...558A..33A,
author = {{Astropy Collaboration} and {Robitaille}, T.~P. and {Tollerud}, E.~J. and
{Greenfield}, P. and {Droettboom}, M. and {Bray}, E. and {Aldcroft}, T. and
{Davis}, M. and {Ginsburg}, A. and {Price-Whelan}, A.~M. and
{Kerzendorf}, W.~E. and {Conley}, A. and {Crighton}, N. and
{Barbary}, K. and {Muna}, D. and {Ferguson}, H. and {Grollier}, F. and
{Parikh}, M.~M. and {Nair}, P.~H. and {Unther}, H.~M. and {Deil}, C. and
{Woillez}, J. and {Conseil}, S. and {Kramer}, R. and {Turner}, J.~E.~H. and
{Singer}, L. and {Fox}, R. and {Weaver}, B.~A. and {Zabalza}, V. and
{Edwards}, Z.~I. and {Azalee Bostroem}, K. and {Burke}, D.~J. and
{Casey}, A.~R. and {Crawford}, S.~M. and {Dencheva}, N. and
{Ely}, J. and {Jenness}, T. and {Labrie}, K. and {Lian Lim}, P. and
{Pierfederici}, F. and {Pontzen}, A. and {Ptak}, A. and {Refsdal}, B. and
author = {{Astropy Collaboration} and {Robitaille}, T.~P. and {Tollerud}, E.~J. and
{Greenfield}, P. and {Droettboom}, M. and {Bray}, E. and {Aldcroft}, T. and
{Davis}, M. and {Ginsburg}, A. and {Price-Whelan}, A.~M. and
{Kerzendorf}, W.~E. and {Conley}, A. and {Crighton}, N. and
{Barbary}, K. and {Muna}, D. and {Ferguson}, H. and {Grollier}, F. and
{Parikh}, M.~M. and {Nair}, P.~H. and {Unther}, H.~M. and {Deil}, C. and
{Woillez}, J. and {Conseil}, S. and {Kramer}, R. and {Turner}, J.~E.~H. and
{Singer}, L. and {Fox}, R. and {Weaver}, B.~A. and {Zabalza}, V. and
{Edwards}, Z.~I. and {Azalee Bostroem}, K. and {Burke}, D.~J. and
{Casey}, A.~R. and {Crawford}, S.~M. and {Dencheva}, N. and
{Ely}, J. and {Jenness}, T. and {Labrie}, K. and {Lian Lim}, P. and
{Pierfederici}, F. and {Pontzen}, A. and {Ptak}, A. and {Refsdal}, B. and
{Servillat}, M. and {Streicher}, O.},
title = "{Astropy: A community Python package for astronomy}",
journal = {\aap},
Expand Down