From 2816d44cae7db642848ec02f3aeb2ac4feff5bca Mon Sep 17 00:00:00 2001
From: Pablo Lezaeta <prflr88@gmail.com>
Date: Wed, 14 Nov 2012 22:38:15 -0300
Subject: [PATCH] fix a conflict

---
 ponyquotes/ponies | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ponyquotes/ponies b/ponyquotes/ponies
index 5b858754..17861fda 100644
--- a/ponyquotes/ponies
+++ b/ponyquotes/ponies
@@ -192,6 +192,7 @@ truffleshuffle
 turf
 turnip
 twilight+twilightcrazyfromball+twilightrage+twilightzero+fillytwilight+twilightthebearded+twilighttime+twilightspike
+thinkleshine
 twist
 vinyl+djpon-3
 violet+royalribbon