Both are part of the Sunnah as the second Athan was introduced by Othman, may Allah be pleased with him when Madinah was expanded. However, if the Athan is not being broadcasted through loudspeakers, it should only be one athan as there is no point in making two athans for the people of the masjid only to hear.