Commit 97f56b50 authored by Craig Maloney's avatar Craig Maloney
Browse files

Merge branch 'master' of github.com:Deevad/peppercarrot.wiki

parents f2140a4b 1c4d7fc2
......@@ -112,7 +112,7 @@ But the damage was done. With **Chaosah** destroyed the magic of Hereva was dete
The remaining members from the magic schools were assembled and a treaty was brokered, the results of which are stored in a magic lock-box visible only to select members of the schools. With the treaty came an end the fighting and bloodshed that almost destroyed Hereva.
The **High Council of Ah** determined that both **Magmah** and **Aquah** were to blame for the conflict. Because **Magmah** and **Aquah** began this conflict The **High Council of Ah** ruled that both **Magmah** and **Aquah** should suffer the ultimate shame of being re-named by the other school for 10 years. **Magmah** renamed **Aquah** as **Wharrgarblah**, and **Aquah** renamed **Magmah** as **Kielbasah**. The records for both schools changed immediately, and all references to the schools were magically altered to use the new names. Having served their sentences the names **Wharrgarblah** and **Kielbasah** have since reverted back to their original names ( **Aquah** and **Kielbasah** respectively ).
The **High Council of Ah** determined that both **Magmah** and **Aquah** were to blame for the conflict. Because **Magmah** and **Aquah** began this conflict The **High Council of Ah** ruled that both **Magmah** and **Aquah** should suffer the ultimate shame of being re-named by the other school for 10 years. **Magmah** renamed **Aquah** as **Wharrgarblah**, and **Aquah** renamed **Magmah** as **Kielbasah**. The records for both schools changed immediately, and all references to the schools were magically altered to use the new names. Having served their sentences the names **Wharrgarblah** and **Kielbasah** have since reverted back to their original names ( **Aquah** and **Magmah** respectively ).
Soon after the treaty **Zombiah** focused on animating constructs and creating stronger materials. It's unclear if **Ah** was responsible for **Zombiah**'s change in focus, or if it became more economical to animate constricts than re-animate the dead. Only those with access to the lock-box know the truth.
......
## This page is a test page
I'm just **testing** github bridge to mattermost.
This has to be **deleted**.
Test2 : should appears in IRC
Test3 : should appears in IRC too
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment