diff options
| author | Florian Dold <florian.dold@gmail.com> | 2016-02-15 19:08:36 +0100 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2016-02-15 19:08:36 +0100 |
| commit | 85d09249c5aa12d785bf70da6f346fa1ea81b0a9 (patch) | |
| tree | 72d35c0bdd614e0c493a08342b70452ec5e5003d /src/frontend/index.php | |
| parent | 6120e636fb6b7890a497530781c121648098e5de (diff) | |
| download | merchant-85d09249c5aa12d785bf70da6f346fa1ea81b0a9.tar.gz merchant-85d09249c5aa12d785bf70da6f346fa1ea81b0a9.tar.bz2 merchant-85d09249c5aa12d785bf70da6f346fa1ea81b0a9.zip | |
fix botched up merge
Diffstat (limited to 'src/frontend/index.php')
| -rw-r--r-- | src/frontend/index.php | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/frontend/index.php b/src/frontend/index.php index ebd8ad06..31dbd617 100644 --- a/src/frontend/index.php +++ b/src/frontend/index.php @@ -134,18 +134,9 @@ echo "\tvar shop_currency = '$SHOP_CURRENCY';\n"; <input type="radio" name="donation_receiver" value="GNUnet">GNUnet</input> <br> <select id="taler-donation" name="donation_amount"> -<<<<<<< HEAD:src/frontend/index.php - <option value="0.1">0.1 <?php echo $MERCHANT_CURRENCY; ?></option> - <option value="1.0">1 <?php echo $MERCHANT_CURRENCY; ?></option> - <option value="6.0">5 <?php echo $MERCHANT_CURRENCY; ?> (*)</option> - <option value="10.0">10 <?php echo $MERCHANT_CURRENCY; ?></option> - </select> - <input type="hidden" name="donation_currency" value=<?php echo $MERCHANT_CURRENCY; ?>/> -======= <!-- options will be added dynamically --> </select> <input id="currency-input" type="hidden" name="donation_currency"/> ->>>>>>> 57e59c69c1196ae882f02f2b9747cdae52491549:src/frontend/index.php <input type="submit" name="keyName" value="Donate!"/> <br> <br> |