What event ended the conflict between Lutheran and Catholic princes in Germany?

The Peace of Augsburg, concluded in 1555, was a significant treaty that addressed the ongoing conflict between Lutheran and Catholic princes in the Holy Roman Empire. This agreement allowed each prince to determine whether they would follow Lutheranism or Roman Catholicism within their own territories, thereby granting official recognition to Lutheranism alongside Catholicism.

The Peace of Augsburg provided a measure of religious tolerance and aimed to bring stability to Germany, which had been ravaged by civil wars and strife stemming from the Protestant Reformation. This accord marked a pivotal moment in the history of religious conflicts in Europe, as it officially recognized the division of Christianity in the empire and lessened the immediate hostilities between the factions.

The other choices, such as the Peace of Versailles and the Treaty of Tordesillas, pertain to different historical contexts, relating either to political agreements outside of the Reformation issues or regarding the division of territories influenced by colonial expansion. The Edict of Nantes, while significant for recognizing religious freedom in France, addressed the conflict specifically between Catholics and Huguenots, not the Lutheran-Catholic divide in Germany.