(no commit message)

diff --git a/Characters/Schola/Magi/AlexiosKaloethes/GeorgiosOfBologna.mdwn b/Characters/Schola/Magi/AlexiosKaloethes/GeorgiosOfBologna.mdwn
index 4dd803ac0e2cba7923d57076082c955e7f2ecf64..08cf6cc79838f57bf36cd3fce543d278f61a3e8a 100644 (file)
--- a/Characters/Schola/Magi/AlexiosKaloethes/GeorgiosOfBologna.mdwn
+++ b/Characters/Schola/Magi/AlexiosKaloethes/GeorgiosOfBologna.mdwn
@@ -1,10 +1,13 @@
-
 Georgios of Bologna, Magus Ex Miscellanea, Orbus Verditius
 
 Character notes:
 *Personality: Clear-thinker +2, Intriguer -1, Bitter +2, Hubris: +5
 *Statistics: Intelligence +3, Comm +3, Presence: -1, Stamina: 0
+<<<<<<< HEAD
 * Known Virtues: Gentle Gift, Puissant Corpus, Puissant Rego
+=======
+* Known Virtues: Gentle Gift, Puissant Corpus, Puissant Terram
+>>>>>>> e5134a0fcadc6c149084c72cf093b799f30ed3f9
 * Known Flaws: Deficient Perdo, Spontaneous Casting Tools
 *Strongest Abilities: 
 >Academic: Artes Liberales (Astronomy), Philosophiae (Natural Philosophy)