SOlved conflict

front-ui/app/stores/cartStore.js

@@ -10,7 +10,6 @@ var DeliveryDestination = require('../models/deliveryDestination');
 var OrderConfirmation = require('../models/orderConfirmation');
 var Place = require('../models/place');
 var Validation = require('../utils/validation');
-var Cart = require('../models/cart');
 
 var _ = require('underscore');
 
@@ -26,8 +25,6 @@ var _deliveryCosts = new Place({
     postalCode: _deliveryDestination.get('place')
 });
 
-var _cart = new Cart();
-
 var _addressColapsed = false;
 
 var supportedPlaces = [{
@@ -2571,7 +2568,6 @@ var nameOfThePlace = function(code) {
 }
 
 var loadCart = function() {
-    _cart.fetch({success: function() {
       _itemsInCart.fetch({
           success: function() {
               states = {}
@@ -2595,7 +2591,6 @@ var loadCart = function() {
               });
           }
       });
-    }});
 
     _cartDataLoadCalled = true;
 };
@@ -2880,8 +2875,7 @@ var CartStore = _.extend({}, EventEmitter.prototype, {
             deliveryCosts: _deliveryCosts,
             destinationValid: isDeliveryDestinationValid(),
             address_colapsed: _addressColapsed,
-            deliveryCostsTarget: getDeliveryCostTarget(),
-            cart: _cart
+            deliveryCostsTarget: getDeliveryCostTarget()
         };
         return state;
     },