fix a conflict

This commit is contained in:
Pablo Lezaeta 2012-11-14 22:38:15 -03:00
parent a93da3fbe6
commit 2816d44cae

View file

@ -192,6 +192,7 @@ truffleshuffle
turf
turnip
twilight+twilightcrazyfromball+twilightrage+twilightzero+fillytwilight+twilightthebearded+twilighttime+twilightspike
thinkleshine
twist
vinyl+djpon-3
violet+royalribbon