Don't like ads? PRO users don't see any ads ;-)
Public Pastes
Guest

Untitled

By: a guest on Aug 1st, 2012  |  syntax: None  |  size: 0.86 KB  |  hits: 9  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. bryan@bryan-HP-Pavilion-dv6500-Notebook-PC:/var/www/Artfony$ git am 0a04c725e3afc2ceeba9ced0e44d90eb8c53bbef.patch
  2. Applying: removed radio's when only one shipping method, and made other shipping methods hidden if free shipping exists
  3. /var/www/Artfony/.git/rebase-apply/patch:26: trailing whitespace.
  4.            
  5. error: patch failed: www/store/app/design/frontend/base/default/template/onestepcheckout/shipping_method.phtml:55
  6. error: www/store/app/design/frontend/base/default/template/onestepcheckout/shipping_method.phtml: patch does not apply
  7. Patch failed at 0001 removed radio's when only one shipping method, and made other shipping methods hidden if free shipping exists
  8. When you have resolved this problem run "git am --resolved".
  9. If you would prefer to skip this patch, instead run "git am --skip".
  10. To restore the original branch and stop patching run "git am --abort".
create a new version of this paste RAW Paste Data