Board Thread:Questions and Answers/@comment-26999015-20160302045654/@comment-3048593-20180316205919

According to Markus & McFeely, the 'Agent Carter' show takes place in the middle of the One-Shot.

After Peggy returns from taking care of the Zodiac virus, it then apparently jump-cuts to after season 2, with both seasons having taken place during that time.