From 3bac2ad33048c1e1ae95c295b2e36241914dbaac Mon Sep 17 00:00:00 2001
From: Malin Freeborn <malinfreeborn@tutamail.com>
Date: Sat, 23 Nov 2019 10:20:35 +0100
Subject: [PATCH] merging

---
 glossary.tex | 2 --
 1 file changed, 2 deletions(-)

diff --git a/glossary.tex b/glossary.tex
index eb8782ec..94b8f72c 100644
--- a/glossary.tex
+++ b/glossary.tex
@@ -115,8 +115,6 @@
 
 \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}}
 
 \newglossaryentry{whitehorse}{name={The White Horse},text={the White Horse},first={the White Horse Inn},description={is a serene and esteemed establishment, with a reputation for high-quality clientel}}
-- 
GitLab