From d8ae551a6035b76b523f84c3e902987a3cca90cd Mon Sep 17 00:00:00 2001
From: Malin Freeborn <malinfreeborn@tutamail.com>
Date: Sat, 23 Nov 2019 13:59:32 +0100
Subject: [PATCH] fucked merge, sorting now
---
glossary.tex | 2 --
1 file changed, 2 deletions(-)
diff --git a/glossary.tex b/glossary.tex
index eb8782ec..cd1ce095 100644
--- a/glossary.tex
+++ b/glossary.tex
@@ -113,8 +113,6 @@
\newglossaryentry{redfall}{name={Redfall},first={Redfall (a village in the North)},description={is rather out-of-the-way village, famed for its red-earth clay and waterfall}}
-\newglossaryentry{college}{name={The College of Alchemy},text={the Collage of Alchemy},first={the Collage of Alchemy},description={is where all alchemists go for training. They maintain a complete monopoly on alchemical magic, and all spells must be learned through them or one of their outposts}}
-
\newglossaryentry{college}{name={The College of Alchemy},text={the College of Alchemy},first={the College of Alchemy},description={is where all alchemists go for training. They maintain a complete monopoly on alchemical magic, and all spells must be learned through them or one of their outposts}}
\newglossaryentry{pig}{name={The Mincing Pig},text={the Mincing Pig},first={the Mincing Pig Tavern},description={boasts the reputation as the loudest tavern in town, placed close to the entrance. Many people don't get farther than `the Pig' when coming to town}}
--
GitLab