401k to Roth IRA

form asks if I rolled over one retirement investment to another type IRA. I withdrew last year from my 401K and deposited in my Roth IRA. Is that a rollover or a conversion?