chiark
/
gitweb
/
~jdamery
/
ArtibusWiki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c4942fe
)
(no commit message)
author
Zavier
<Zavier@web>
Sat, 17 Oct 2015 21:12:10 +0000
(22:12 +0100)
committer
Senji
<senji@ysolde.ucam.org>
Sat, 17 Oct 2015 21:12:10 +0000
(22:12 +0100)
Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Alexios.mdwn
patch
|
blob
|
history
diff --git
a/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Alexios.mdwn
b/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Alexios.mdwn
index ee846805664ba220f0e76e58f95e9c15e11856e8..574c352a5d4559ff079e654bcdc1656f5f16afc4 100644
(file)
--- a/
Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Alexios.mdwn
+++ b/
Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Alexios.mdwn
@@
-18,25
+18,11
@@
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 | | | | | | | | | |
| +1 | Skylight | | | | | | +1 | | | +1 | | |
| +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 | | | | | | | | |
-| |||||||||||||
-=======
-=======
->>>>>>> 07454893ab2fa8b35798f78d42902128a68256aa
| 0 | Superior Equipment | +1 | +2 | +1 | | | | | | | | +1 |
| 0 | Magical Superior Heating | | | | | +1 | +1| | | | +1 | |
| 0 |Studio | | | | | | +1 | | | | | |
| 0 |Familiar | +6 | | +3 | | | | | | | | |
| |||||||||||
| 0 | Superior Equipment | +1 | +2 | +1 | | | | | | | | +1 |
| 0 | Magical Superior Heating | | | | | +1 | +1| | | | +1 | |
| 0 |Studio | | | | | | +1 | | | | | |
| 0 |Familiar | +6 | | +3 | | | | | | | | |
| |||||||||||
-<<<<<<< HEAD
->>>>>>> 62bb47f74e439324755ee1d7e5b2ec0eb2321b0b
-=======
->>>>>>> 07454893ab2fa8b35798f78d42902128a68256aa
| +2 | **Totals** | +5 | +2 | +5 | | +2 | +8 | +4 | +5 | +1 | +1 | +1 |
| +2 | **Totals** | +5 | +2 | +5 | | +2 | +8 | +4 | +5 | +1 | +1 | +1 |