(no commit message)

diff --git a/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Alexios.mdwn b/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Alexios.mdwn
index 0fc9284ee8b819339c917ad3ce2a93517d8c0df6..c535a03c375f9838dc49041ddaf065609dfebe27 100644 (file)
--- a/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Alexios.mdwn
+++ b/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Alexios.mdwn
@@ -1,13 +1,3 @@
-<<<<<<< HEAD
-This lab is in a large converted storeroom in the front range of the inn although its origins are hard to tell.  A hypocaust has been recently extended to extend to it and so it has a fresh  flagstone floor. There is also a fireplace that could be lit in the unlikely event it becomes cold enough to be needed, this shares a chimney with the barracks in the converted stable on the other side of that wall.
-It is the largest lab inside the Inn and access to this lab is both from the outside of the Inn, via a dedicated passageway and from another newly created doorway, that goes into a second room that has been outfitted to be a studio although it is, as yet, empty. There is a staircase within this studio that goes upstairs to a small bedroom.  
-This lab is tidy and well-ordered with everything neatly arranged. It has been opulently decorated in a very foreign fashion with cushions and wall hangings in bright colours and well-chosen wooden furniture that equipment and ingredients are carefully stored in.
-It has an observation gallery (Gallery)  at one end and a throne with gilded patterns of Greek lettering sat at the other  (Throne, Greater Feature and Greater Focus).  There is also a large shuttered skylight in the ceiling allowing celestial observations (Lesser Feature). There is normally a butterfly flitting around somewhere if Alexios is in residence. He occasionally orders humans to do things; normally things they were just about to do  (familiar, Free as does not take much space). 
-
-|   Size |            | GQ | Up | Safe | Warp | Heal | Æsth | Teaching | Rego | Int |Ig | Vis Ex |
-|-------:|:-----------|:--:|:--:|:----:|:----:|:----:|:----:|:--------:|:--:|:--:|:--:|:--:|
-|     +1 | Gallery    |    |    |   +1 |      |      |   + |       +1 |    |    |    |    |
-=======
 Alexios' Laboratory
 
 This lab is in a large converted storeroom in the front range of the inn although its origins are hard to tell.  A hypocaust has been recently extended to extend to it and so it has a fresh  flagstone floor. There is also a fireplace that could be lit in the unlikely event it becomes cold enough to be needed, this shares a chimney with the barracks in the converted stable on the other side of that wall.
@@ -19,11 +9,10 @@ This lab is tidy and well-ordered with everything neatly arranged. It has been o
 It has an observation gallery (Gallery)  at one end and a throne with gilded patterns of Greek lettering sat at the other  (Throne, Greater Feature and Greater Focus).  There is also a large shuttered skylight in the ceiling allowing celestial observations (Lesser Feature). 
 
 There is normally a butterfly flitting around somewhere if Alexios is in residence. He occasionally orders humans to do things; normally things they were just about to do  (familiar, Free as does not take much space). 
-
+| &nbsp; |||||||||||
 |   Size |            | GQ | Up | Safe | Warp | Heal | Æsth | Teaching | Rego | Int |Ig | Vis Ex |
 |-------:|:-----------|:--:|:--:|:----:|:----:|:----:|:----:|:--------:|:--:|:--:|:--:|:--:|
 |     +1 | Gallery    |    |    |   +1 |      |      |   +1 |       +1 |    |    |    |    |
->>>>>>> e3b2b38526a1ae13d4269c1ef7af4f0c8d0209b0
 |     +3 | Throne     |    |    |      |      |      |   +2 |       +2 | +1 |    |    |    |
 |     -3 | --""--     | -2 |    |      |      |      |      |          | +4 |    |    |    |
 |     +1 | Skylight   |    |    |      |      |      |   +1 |          |    | +1 |    |    |
@@ -31,20 +20,8 @@ There is normally a butterfly flitting around somewhere if Alexios is in residen
 |     -1 | Missing Equipment (Perdo, Longevity Rituals)|    | -1 |      |      |      |    |          |    |   |    |    |
 |    0 | Superior Equipment| +1   | +2   |  +1   |      |      |    |          |    |    |    |  +1  |
 |     0 | Magical Superior Heating   |    |    |      |      |   +1 |  +1  |          |    |    |  +1  |    |
-<<<<<<< HEAD
-|     0 |Studio|    |    |      |      |      |      |          |    |  +1|    |    |
-|     0 |Familiar| +5 |    |   +3  |      |      |      |          |    |  +1|    |    |
-
-| &nbsp; |||||||||||
-
-|     +2 | **Totals** | -2 |  0 |   +1 |      |      |   +4 |       +3 | +5 | +1 |    |
-=======
 |     0 |Studio       |    |    |      |      |      |  +1    |          |    |  |    |    |
 |     0 |Familiar| +5 |    |   +3  |      |      |      |          |    |  |    |    |
-
 | &nbsp; |||||||||||
+|     +2 | **Totals** | +4 |  +2 |   +5 |      |  +2    |   +8 |       +4 | +5 | +1 |  +1  |  +1 |
 
-|     +2 | **Totals** | +4 |  +2 |   +5 |      |  +2    |   +7 |       +4 | +5 | +1 |  +1  |  +1 |
->>>>>>> e3b2b38526a1ae13d4269c1ef7af4f0c8d0209b0
-| &nbsp; |||||||||||
-[Lab Details]