(no commit message)

diff --git a/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Alexios.mdwn b/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Alexios.mdwn
index ac64698bac4f4602ff978fcf698336226a4362e5..ee846805664ba220f0e76e58f95e9c15e11856e8 100644 (file)
--- a/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Alexios.mdwn
+++ b/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Alexios.mdwn
@@ -19,18 +19,24 @@ There is normally a butterfly flitting around somewhere if Alexios is in residen
 |     +1 | Opulent                                                                  |       |  +1 |      |       | +1 |  +2  |    +1   |      |         |       |      |
 |     -1 | Missing Equipment (Perdo, Longevity Rituals)|       | -1  |       |       |      |          |          |       |        |        |      |
 <<<<<<< HEAD
+<<<<<<< HEAD
 |     0  | Superior Equipment                                                | +1   | +2   | +1 |    |      |         |          |        |         |        |  +1  |
 |     0  | Magical Superior Heating                                      |       |        |        |     | +1 |  +1|          |         |        |  +1  |       |
 |     0  |Studio                                                                         |       |       |        |      |      |  +1    |       |         |        |       |      |
 |     0  |Familiar                                                                      | +5 |       |   +3  |      |      |        |         |         |        |       |        |
 | &nbsp; |||||||||||||
 =======
+=======
+>>>>>>> 07454893ab2fa8b35798f78d42902128a68256aa
 |    0 | Superior Equipment                                                | +1   | +2   | +1 |    |      |         |          |        |         |        |  +1  |
 |     0 | Magical Superior Heating                                      |       |        |        |     | +1 |  +1|          |         |        |  +1  |       |
 |     0 |Studio                                                                         |       |       |        |      |      |  +1    |       |         |        |       |      |
 |     0 |Familiar                                                                      | +6 |       |   +3  |      |      |        |         |         |        |       |        |
 | &nbsp; |||||||||||
+<<<<<<< HEAD
 >>>>>>> 62bb47f74e439324755ee1d7e5b2ec0eb2321b0b
+=======
+>>>>>>> 07454893ab2fa8b35798f78d42902128a68256aa
 |     +2 | **Totals**                                                              | +5 |  +2 |   +5 |      |  +2    |   +8 |       +4 | +5 | +1 |  +1  |  +1 |