From: Senji <senji@ysolde.ucam.org>
Date: Fri, 11 Sep 2015 22:41:29 +0000 (+0100)
Subject: Umm...
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~jdamery/git?a=commitdiff_plain;h=6a2e1db6b069c7d60ca5a9a6eef7ce26274e86b8;p=ArtibusWiki.git

Umm...
---

diff --git a/Players/discussion.mdwn b/Players/discussion.mdwn
index f390fac3..4fc093c6 100644
--- a/Players/discussion.mdwn
+++ b/Players/discussion.mdwn
@@ -12,11 +12,8 @@ Scottish student harmonist otter Bjornaer Mystery Cultist
 
 : Will depend on someone being happy to run mystery cult plots in
 downtime (which are likely to be fundamentally solo type stuff)
-<<<<<<< HEAD
-*Zavier: I'd happily run mystery cult stuff
-=======
 ::*Zavier: I'd happily run mystery cult stuff
->>>>>>> 25e03b1469b6ffae75f4334486a0913c7f68b7ae
+
 : Also someone to take control of Loch Legean Tribunal
 
 
@@ -25,11 +22,8 @@ Graeco-Roman Faerie-blooded Merinita
 : Would require someone to basically handle all the Faeries (there's
 nothing more ridiculous than a Merinita who can't go on Merinita
 plots!)
-<<<<<<< HEAD
-*Zavier: I'd certainly be amused to be the Storyteller of Faerie though i warn you I'd be taking the courts seriously
-=======
 ::*Zavier: I'd certainly be amused to be the Storyteller of Faerie though i warn you I'd be taking the courts seriously
->>>>>>> 25e03b1469b6ffae75f4334486a0913c7f68b7ae
+
 : Might require some mystery cult stuff too; but much less than the
 above.
 
@@ -38,11 +32,8 @@ Transylvanian Tremere
 
 : Would require someone to run basically all the rest of House
 Tremere, including the Blackthorn covenant in Stonehenge.
-<<<<<<< HEAD
-*Zavier: am i allowed to recanonise vampires if i did this?
-=======
+
 ::*Zavier: am i allowed to recanonise vampires if i did this?
->>>>>>> 25e03b1469b6ffae75f4334486a0913c7f68b7ae
 
  I don't have companion ideas, but depending on what people are happy
 to run plots for I might well recycle parts of unused ideas from