solve code reviews, resolve rebase conflicts

This commit is contained in:
Rishabh Saxena 2016-07-14 19:10:33 +05:30
parent 9b704e483e
commit ae44abc7e6
10 changed files with 32 additions and 45 deletions

View file

@ -31,4 +31,4 @@
= number_to_currency @total_amount_to_pay
.form-group
= f.submit "Charge Card", class: "btn btn-primary"
= link_to "Cancel", conference_conference_registrations_path, class: "btn btn-danger"
= link_to "Cancel", conference_conference_registration_path, class: "btn btn-danger"