diff options
author | Mattias Andrée <maandree@operamail.com> | 2012-08-19 19:52:18 +0200 |
---|---|---|
committer | Mattias Andrée <maandree@operamail.com> | 2012-08-19 19:52:18 +0200 |
commit | 64b726770a07a0e04bcec3cf8ab23af4bcc2332f (patch) | |
tree | a2d2b4fb14895486c04262da022d4bdea7acd7d6 /ponyquotes/celestia.0 | |
parent | 41b2d257c71f654dd2fd9921d1f75f44b97a6592 (diff) | |
parent | 6dc632a155db800997e0eb2dec420a6233a2d141 (diff) | |
download | ponysay-64b726770a07a0e04bcec3cf8ab23af4bcc2332f.tar.gz ponysay-64b726770a07a0e04bcec3cf8ab23af4bcc2332f.tar.bz2 ponysay-64b726770a07a0e04bcec3cf8ab23af4bcc2332f.zip |
merge conflict resolved
Diffstat (limited to 'ponyquotes/celestia.0')
-rw-r--r-- | ponyquotes/celestia.0 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ponyquotes/celestia.0 b/ponyquotes/celestia.0 new file mode 100644 index 0000000..20ae8ff --- /dev/null +++ b/ponyquotes/celestia.0 @@ -0,0 +1,5 @@ +Discord is the mischievous spirit of Disharmony. Before my sister and I stood +up to him, he ruled Equestria in an eternal state of unrest, and unhappiness. +Luna and I saw how miserable life was for Earth ponies, pegasi, and unicorns +alike. So after discovering the Elements of Harmony, we combined our power and +rose up against him, turning him to stone! |