Resolved merge conflicts.

This commit is contained in:
Lekshmi S 2020-03-11 16:21:52 +05:30
parent 33b224add0
commit a16855527f

View File

@ -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 */,