Well, either way.
A fork with a 1" inner diameter steerer has an 1 1/8" outer diameter steerer, and that's the measurement usually used to identify forks. But maybe you guys do it differently.

I'm pretty sure it won't fit. Anyway, I've already installed the 1" fork and Quill, now I'll bring it to my LBS for the rest of the missing parts (Crankset, Wheelset, Brakes, etc.). Thanks for all your help