SOlved conflict

2016-03-16 12:12:26 +01:00
parent d111406f03 fdc3362719
commit 7e62881d16
4 changed files with 26 additions and 15 deletions
--- a/front-api/views/cart_trello.erb
+++ b/front-api/views/cart_trello.erb
@@ -37,6 +37,8 @@ Bosna i Hercegovina

 **Naručeno:** <%= @cart.updated_at.in_time_zone("Europe/Sarajevo").strftime("%A %d.%m.%Y. %H:%M") %>

+<% end %>
+

 <% if dd.instant_delivery %>
 ** OVO JE NARUDŽBA ZA INSTANT DOSTAVU **