definitely FD upper limit adjustment. Set it so that with the RD in the lowest cog (smallest) and the chain on the outer front chainring it just barely clears it. Don't forget to take the stress off before adjusting the limit screws. So see where you want it, then shift to the small ring so it isn't against the outer stop, then adjust it a little, shift to the big, check, repeat.

Just a general tip: don't turn limit screws or those weak inline barrel adjusters when they're under pressure.