fix a conflict

This commit is contained in:
Pablo Lezaeta 2012-11-14 22:37:06 -03:00
parent d5cb341a2d
commit a93da3fbe6

View file

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