From a894fb46be5cd516de5013df43124751e9bfd6ce Mon Sep 17 00:00:00 2001 From: rafsanulhasan Date: Sat, 1 Sep 2018 10:05:14 +0600 Subject: [PATCH] Resolved conflicts --- src/Services/Identity/Identity.API/Identity.API.csproj | 4 ++-- src/Web/WebStatus/WebStatus.csproj | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Services/Identity/Identity.API/Identity.API.csproj b/src/Services/Identity/Identity.API/Identity.API.csproj index 992a1e54b..1b823e0c1 100644 --- a/src/Services/Identity/Identity.API/Identity.API.csproj +++ b/src/Services/Identity/Identity.API/Identity.API.csproj @@ -22,9 +22,9 @@ - + - + diff --git a/src/Web/WebStatus/WebStatus.csproj b/src/Web/WebStatus/WebStatus.csproj index ad653b239..cdfbf16b4 100644 --- a/src/Web/WebStatus/WebStatus.csproj +++ b/src/Web/WebStatus/WebStatus.csproj @@ -6,9 +6,9 @@ - - - + + +