fix merge error

This commit is contained in:
Christian Arenas 2017-05-30 18:35:09 +02:00
parent ea02ecc160
commit 4d07fecc3b

View File

@ -18,6 +18,8 @@ using Microsoft.Extensions.Options;
using RabbitMQ.Client; using RabbitMQ.Client;
using System.Threading.Tasks; using System.Threading.Tasks;
using StackExchange.Redis; using StackExchange.Redis;
using Microsoft.eShopOnContainers.BuildingBlocks.EventBusServiceBus;
using Microsoft.Azure.ServiceBus;
namespace Microsoft.eShopOnContainers.Services.Basket.API namespace Microsoft.eShopOnContainers.Services.Basket.API
{ {