Permalink
Browse files

Fixes #1014

Apr 08, 2013
dominic-p added commit #30141e6d3b

Dec 13, 2013
mattyza commits #0d43ffbf13 without addressing merge conflict message.
This merge conflict contained the issue.

Dec 19, 2013
Shelob9 commits #b52bea1974 to remove the merge errors text from the
minified script, fixing the syntactical error, but leaving logical
errors in place.
  • Loading branch information...
1 parent ce5441b commit 7ecc526b33e55aca622b5ff2f951436541add5bf @tylerxo tylerxo committed Feb 12, 2014
Showing with 46 additions and 5 deletions.
  1. +43 −2 jquery.flexslider-min.js
  2. +3 −3 jquery.flexslider.js
Oops, something went wrong.

0 comments on commit 7ecc526

Please sign in to comment.