Allow either header or major/minor/angle in add_beam(), not both
Allow either header or major/minor/angle in add_beam(), not both

astropy/astropy,larrybradley/astropy,larrybradley/astropy,lpsinger/astropy,astropy/astropy,astropy/astropy,pllim/astropy,lpsinger/astropy,larrybradley/astropy,lpsinger/astropy,mhvk/astropy,lpsinger/astropy,pllim/astropy,mhvk/astropy,astropy/astropy,lpsinger/astropy,astropy/astropy,pllim/astropy,mhvk/astropy,larrybradley/astropy,larrybradley/astropy,mhvk/astropy,mhvk/astropy,pllim/astropy,pllim/astropy