单项选择题

It was not until 1936 ______ baseball became a regular part of Olympic Games.

A. then
B. which
C. that
D. when