diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-02-22 16:39:09 -0500 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-02-22 16:39:09 -0500 |
| commit | ca1574c0dd3baf85a95b804a73a5101f77ad8261 (patch) | |
| tree | 289701f95c964f1c5ba735cc69971ce72935c3b6 /xml | |
| parent | 0d77d11b708e57546d8267e957230c30bc5d048c (diff) | |
Work
Diffstat (limited to 'xml')
| -rw-r--r-- | xml/playerSpawnHill1.xml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/xml/playerSpawnHill1.xml b/xml/playerSpawnHill1.xml index c5e736b..0c0fe4c 100644 --- a/xml/playerSpawnHill1.xml +++ b/xml/playerSpawnHill1.xml @@ -29,14 +29,9 @@ And it wasn't stormy. You should go talk to my friend Johnny. He's a pretty chill dude. </text> -<<<<<<< HEAD - <text id="2" call="Johnny" callid="1"> - what you have done it to trick Microsoft? -======= <text id="2" > Niice. <quest check="Your First Quest" fail="3" /> ->>>>>>> 3033594b89f23e65b6152daa6610f991307f2f67 </text> <text id="3"> |