From a16855527f99841a4071490e1877dbf76b4d2bca Mon Sep 17 00:00:00 2001
From: Lekshmi S <lekshmi.s@publicissapient.com>
Date: Wed, 11 Mar 2020 16:21:52 +0530
Subject: [PATCH] Resolved merge conflicts.

---
 MVMCoreUI.xcodeproj/project.pbxproj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index b6657933..fcc5da40 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -846,7 +846,6 @@
 			path = FourColumn;
 			sourceTree = "<group>";
 		};
-		525239C32407FFCC00454969 /* LockUps */ = {
 		525239BE2407BCE500454969 /* TwoColumn */ = {
 			isa = PBXGroup;
 			children = (
@@ -856,7 +855,7 @@
 			path = TwoColumn;
 			sourceTree = "<group>";
 		};
-		946EE1B5237B663A0036751F /* Extensions */ = {
+		525239C32407FFCC00454969 /* LockUps */ = {
 			isa = PBXGroup;
 			children = (
 				525019DB2406430700EED91C /* ListProgressBarDataModel.swift */,