(no commit message)

[ArtibusWiki.git] / Setting / Locations / Stonehenge / ScholaPythagoranis / Labs / Alexios.mdwn

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