resolve conflict

ajax_post
Yang Liuxin 3 years ago
parent 288f61452a
commit 151f084134

@ -10,7 +10,7 @@
{% endif %}
</div>
<div class="panel-body">
<p><strong>Item Describe:</strong>{{ collect.collected_transaction.item_describe }}</p>
<p><strong>Item Describe: </strong>{{ collect.collected_transaction.item_describe }}</p>
</div>
<!-- List group -->
<ul class="list-group">

Loading…
Cancel
Save