From: Jonathan Amery <jdamery+zgit@ysolde.ucam.org>
Date: Wed, 18 Mar 2015 18:19:40 +0000 (+0000)
Subject: Merge branch 'master' of /home/wiki/thymewiki/ThymeWiki
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~nmamery/git?a=commitdiff_plain;h=56ea4c4347952a52de7b9b5cd0fd9ee49ab29a76;hp=5130b7790ed195a9db18e7442066da7fc225a656;p=ThymeWiki.git

Merge branch 'master' of /home/wiki/thymewiki/ThymeWiki
---

diff --git a/sandbox/Test_Test_One.mdwn b/sandbox/Test_Test_One.mdwn
index 3dd4cd6..9b0ea86 100644
--- a/sandbox/Test_Test_One.mdwn
+++ b/sandbox/Test_Test_One.mdwn
@@ -1,7 +1,6 @@
-<br />
 |:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|:---|
 |**_Spirtual Attributes_**||||||||||||||
-|*Willpower* | &#9679;&#9679;&#9679;&#9679;&#9679; &#9679;&#9679;|(7)|  |&nbsp;|*Magick*|&#9679;&#9679;&#9679;&#9679;|(4)|  |&nbsp;|*Resonance*|&#9679;|(1)|  |
+|*Willpower*|&#9679;&#9679;&#9679;&#9679;&#9679; &#9679;&#9679;|(7)|  |&nbsp;|*Magick*|&#9679;&#9679;&#9679;&#9679;|(4)|  |&nbsp;|*Resonance*|&#9679;|(1)|  |
 |&nbsp;||||||||||||||
 
 |**_Attributes_**||||||||||||||
@@ -14,7 +13,7 @@
 |**_Abilities_**  ||||||||||||||
 |&nbsp;||||||||||||||
 
-|**Strength**|  | |  | |**Dexterity**|  | |  | |**Stamina**|  |  |  |
+|**Strength**||||&nbsp;|**Dexterity**||||&nbsp;|**Stamina**||||
 |*Brawl*|&#9679;|(1)|  | |*Athletics*|  |(0)|  | |*Endurance*|  |(0)|  |
 |*Might*|  |(0)|  | |*Drive*|  |(0)|  | |*Resistance*|&#9679;&#9679; |(2)|  |
 |  | |  | |  |*Firearms*|&#9679;&#9679;|(2)|  | |  | |  | |
@@ -25,7 +24,7 @@
 |  | |  | |  |*Stealth*|  |(0)|  | |  | |  | |
 |&nbsp;||||||||||||||
 
-|**Perception**|  | |  | |**Intelligence**|  | |  | |**Wits**|  |
+|**Perception**||||&nbsp;|**Intelligence**||||&nbsp;|**Wits**||||
 |*Awareness*|&#9679;&#9679;|(2)|  | |*Academics*|&#9679;&#9679;|(2)|  | |*Arts*|&#9679; |(1)|  |
 |*Investigation*|&#9679;&#9679;&#9679;|(3)|  | |*Bureaucracy*|&#9679;|(1)|  | |*Biz*|&#9679; |(1)|  |
 |  | |  | |  |*Computer*|&#9679;|(1)|  | |*Rapport*|&#9679;&#9679;&#9679; |(3)|  |
@@ -37,7 +36,7 @@
 |  | |  | |  |*Survival*|&#9679;|(1)|  | |  | |  | |
 |&nbsp;||||||||||||||
 
-|**Appearance**|  | |  | |**Manipulation**|  | |  | |**Charisma**|  |
+|**Appearance**||||&nbsp;|**Manipulation**||||&nbsp;|**Charisma**||||
 |*Intimidation*|  |(0)|  | |*Interrogation*|  |(0)|  | |*Command*|  |(0)|  |
 |*Style*|  |(0)|  | |*Streetwise*|  |(0)|  | |*Etiquette*|&#9679;&#9679; |(2)|  |
 |  | |  | |  |*Subterfuge*|  |(0)|  | |*Perform*|&#9679; |(1)|  |
@@ -47,7 +46,7 @@
 |Allies|  |(0)|  | |Contacts|&#9679;&#9679;|(2)|The two wizards|  |Mentor|&#9679;&#9679;|(2)|*Girion*|
 |Attunement|&#9679;&#9679;&#9679;|(3)|  | |Followers|  |(0)|  | |Resources|&#9679;&#9679; |(2)|  |
 |Backing|&#9679;&#9679; |(2)|Interpol M |  |Influence|  |(0)|  | |Talent|&#9679;&#9679;&#9679;  |(3)|  |
-|Cipher|&#9679;|(1)|  | |Magickal Material|  |(0)|  |&nbsp;|||||
+|Cipher|&#9679;|(1)|  | |Magickal Material|  |(0)|  |&nbsp;|  |  |  |  |
 |&nbsp;||||||||||||||