Skip to content

Commit

Permalink
Fixes woocommerce#1014
Browse files Browse the repository at this point in the history 
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
Tyler Smith committed Feb 12, 2014
1 parent ce5441b commit 7ecc526
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 5 deletions.
Loading

0 comments on commit 7ecc526

Please sign in to comment.