]> source.dussan.org Git - jquery.git/commit
Tests: Fix merge conflict
authorCorey Frang <gnarf@gnarf.net>
Sat, 27 Jun 2015 00:30:52 +0000 (20:30 -0400)
committerCorey Frang <gnarf@gnarf.net>
Sat, 27 Jun 2015 00:30:56 +0000 (20:30 -0400)
commitd07774ae0632a8a43ff490562c0e9bb3ae63e2dc
treea7b5b463157a484779b7564c5c10db16f1cec8c4
parent1390d0736f6cff7a75ec0730967a98e26df1aa13
Tests: Fix merge conflict

Introduced in 6b10f9d7e9fb6d062d2bbda49196544cd059b05c originally.

Had a rebase conflict that I fixed but forgot to ⌘-s. ☹
src/effects.js
test/unit/effects.js