Shakugan no Shana: solve special conflicts #245

Closed atraholt closed 5 years ago