resolve merge conflict on glossary.md

braydie · braydie · commit 403eb0045220 · 2016-01-18T15:23:22.000Z
diff --git a/GLOSSARY.md b/GLOSSARY.md
@@ -39,6 +39,7 @@ The people with whom you share loyalty to a common goal.
 Big improvements that cost little.
 
 ### Entrepreneur
+
 The initiator of projects.
 
 ### garbage
