From: Zavier <Zavier@web>
Date: Fri, 15 Jan 2016 02:15:56 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~jdamery/git?a=commitdiff_plain;h=547257f3d78f1ce660a3e95fac25626e8ce05de3;p=ArtibusWiki.git

---

diff --git a/Characters/Schola/Magi/AlexiosKaloethes/GeorgiosOfBologna.mdwn b/Characters/Schola/Magi/AlexiosKaloethes/GeorgiosOfBologna.mdwn
index 4dd803ac..08cf6cc7 100644
--- 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)