Public Pastes
Guest

Untitled

By: a guest on Jan 28th, 2012  |  syntax: None  |  size: 1.45 KB  |  hits: 10  |  expires: Never
download  |  raw  |  embed  |  report abuse
Copied
  1. [16:07][alienado@alienado:~/Proyectos/aladino(working_master)]$ git rebase master
  2. First, rewinding head to replay your work on top of it...
  3. HEAD is now at 644f99a solucionando conflicto en formulario compania
  4. Applying arreglos en formulario para el puto internet explorer
  5. .dotest/patch:16: trailing whitespace.
  6.   %legend= _('Ingresa la información de tu empresa.')  
  7. .dotest/patch:27: trailing whitespace.
  8.   %legend= _('Ingresa datos de contacto de la empresa:')  
  9. .dotest/patch:38: trailing whitespace.
  10.   %legend= _('Propiedad y capital.')  
  11. .dotest/patch:49: trailing whitespace.
  12.   %legend= _('Comercio y Mercado.')
  13. .dotest/patch:60: trailing whitespace.
  14.   %legend= _('Información de Fábrica.')  
  15. error: patch failed: app/views/companies/_form.html.haml:61
  16. error: app/views/companies/_form.html.haml: patch does not apply
  17. Using index info to reconstruct a base tree...
  18. <stdin>:16: trailing whitespace.
  19.   %legend= _('Ingresa la información de tu empresa.')  
  20. <stdin>:27: trailing whitespace.
  21.   %legend= _('Ingresa datos de contacto de la empresa:')  
  22. <stdin>:38: trailing whitespace.
  23.   %legend= _('Propiedad y capital.')  
  24. <stdin>:49: trailing whitespace.
  25.   %legend= _('Comercio y Mercado.')
  26. <stdin>:60: trailing whitespace.
  27.   %legend= _('Información de Fábrica.')  
  28. warning: squelched 2 whitespace errors
  29. warning: 7 lines add whitespace errors.
  30. Falling back to patching base and 3-way merge...
  31. Auto-merged app/views/companies/_form.html.haml
create a new version of this paste RAW Paste Data