Skip to content

Commit

Permalink
fix/#154 충돌 해결
Browse files Browse the repository at this point in the history
  • Loading branch information
@hooni0918
hooni0918 committed Jul 11, 2024
1 parent 41f9598 commit 121f927
Showing 1 changed file with 44 additions and 8 deletions.
52 changes: 44 additions & 8 deletions KkuMulKum.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
objects = {

/* Begin PBXBuildFile section */
780CC18E2C405B11008996D0 /* MyPageContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 780CC1882C405B11008996D0 /* MyPageContentView.swift */; };
780CC18F2C405B11008996D0 /* MyPageNavigationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 780CC1892C405B11008996D0 /* MyPageNavigationView.swift */; };
780CC1902C405B11008996D0 /* MyPageEtcSettingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 780CC18A2C405B11008996D0 /* MyPageEtcSettingView.swift */; };
780CC1912C405B11008996D0 /* MyPageAlarmSettingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 780CC18B2C405B11008996D0 /* MyPageAlarmSettingView.swift */; };
780CC1922C405B11008996D0 /* MyPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 780CC18D2C405B11008996D0 /* MyPageViewController.swift */; };
782B406F2C3DBF93008B0CA7 /* ProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782B406E2C3DBF93008B0CA7 /* ProfileViewController.swift */; };
782B40722C3DBFA3008B0CA7 /* ProfileViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782B40712C3DBFA3008B0CA7 /* ProfileViewModel.swift */; };
782B40752C3DBFBA008B0CA7 /* ProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782B40742C3DBFBA008B0CA7 /* ProfileView.swift */; };
Expand Down Expand Up @@ -133,6 +138,11 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
780CC1882C405B11008996D0 /* MyPageContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyPageContentView.swift; sourceTree = "<group>"; };
780CC1892C405B11008996D0 /* MyPageNavigationView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyPageNavigationView.swift; sourceTree = "<group>"; };
780CC18A2C405B11008996D0 /* MyPageEtcSettingView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyPageEtcSettingView.swift; sourceTree = "<group>"; };
780CC18B2C405B11008996D0 /* MyPageAlarmSettingView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyPageAlarmSettingView.swift; sourceTree = "<group>"; };
780CC18D2C405B11008996D0 /* MyPageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyPageViewController.swift; sourceTree = "<group>"; };
782B406E2C3DBF93008B0CA7 /* ProfileViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewController.swift; sourceTree = "<group>"; };
782B40712C3DBFA3008B0CA7 /* ProfileViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewModel.swift; sourceTree = "<group>"; };
782B40742C3DBFBA008B0CA7 /* ProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -178,7 +188,6 @@
DDA2EE722C385EB9007C6059 /* MainTabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabBarController.swift; sourceTree = "<group>"; };
DDA2EE742C385FB1007C6059 /* HomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = "<group>"; };
DDA2EE762C385FC3007C6059 /* GroupListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupListViewController.swift; sourceTree = "<group>"; };
DDA2EE782C385FCF007C6059 /* MyPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPageViewController.swift; sourceTree = "<group>"; };
DDAF1C832C3D5D19008A37D3 /* ViewModelType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModelType.swift; sourceTree = "<group>"; };
DDAF1C882C3D6E3D008A37D3 /* ReadyStatusViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReadyStatusViewController.swift; sourceTree = "<group>"; };
DDAF1C892C3D6E3D008A37D3 /* PromiseSegmentedControl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PromiseSegmentedControl.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -273,6 +282,34 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
780CC1862C405B11008996D0 /* MyPage */ = {
isa = PBXGroup;
children = (
780CC1872C405B11008996D0 /* View */,
780CC18C2C405B11008996D0 /* ViewController */,
);
path = MyPage;
sourceTree = "<group>";
};
780CC1872C405B11008996D0 /* View */ = {
isa = PBXGroup;
children = (
780CC1882C405B11008996D0 /* MyPageContentView.swift */,
780CC1892C405B11008996D0 /* MyPageNavigationView.swift */,
780CC18A2C405B11008996D0 /* MyPageEtcSettingView.swift */,
780CC18B2C405B11008996D0 /* MyPageAlarmSettingView.swift */,
);
path = View;
sourceTree = "<group>";
};
780CC18C2C405B11008996D0 /* ViewController */ = {
isa = PBXGroup;
children = (
780CC18D2C405B11008996D0 /* MyPageViewController.swift */,
);
path = ViewController;
sourceTree = "<group>";
};
782B406C2C3DBF72008B0CA7 /* Profile */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -404,7 +441,6 @@
children = (
78B9286A2C29402C006D9942 /* KkuMulKum */,
78B928692C29402C006D9942 /* Products */,
78AED1232C3D8E27000AD80A /* Recovered References */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -546,7 +582,7 @@
DDA2EE7E2C3860B2007C6059 /* Core */,
DDA2EE7B2C386078007C6059 /* Home */,
DDA2EE7C2C38607F007C6059 /* GroupList */,
78AED1242C3D8E56000AD80A /* MyPage */,
780CC1862C405B11008996D0 /* MyPage */,
DD865B652C3920F600C351A2 /* Onboarding */,
DDAF1C872C3D6E3D008A37D3 /* Promise */,
);
Expand Down Expand Up @@ -887,7 +923,6 @@
files = (
DDAF1C8E2C3D6E3D008A37D3 /* ReadyStatusViewController.swift in Sources */,
DED5DBF22C34534A006ECE7E /* BaseCollectionReusableView.swift in Sources */,
78AED12D2C3D8E56000AD80A /* MyPageNavigationView.swift in Sources */,
DED5DBEC2C345210006ECE7E /* BaseViewController.swift in Sources */,
DD30721A2C3C011600416D9F /* AddPromiseRequestModel.swift in Sources */,
DD30721E2C3C0CC800416D9F /* PromiseInfoResponseModel.swift in Sources */,
Expand All @@ -914,15 +949,16 @@
DDAF1C912C3D6E3D008A37D3 /* TardyViewController.swift in Sources */,
782B407D2C3E3984008B0CA7 /* WelcomeViewController.swift in Sources */,
DE8248002C36E857000601BC /* ObservablePattern.swift in Sources */,
780CC1902C405B11008996D0 /* MyPageEtcSettingView.swift in Sources */,
780CC18E2C405B11008996D0 /* MyPageContentView.swift in Sources */,
DDAF1C902C3D6E3D008A37D3 /* PromiseViewModel.swift in Sources */,
DE254AAA2C31190E00A4015E /* UIStackView+.swift in Sources */,
78AED12E2C3D8E56000AD80A /* MyPageEtcSettingView.swift in Sources */,
780CC1912C405B11008996D0 /* MyPageAlarmSettingView.swift in Sources */,
DED5DBF02C345317006ECE7E /* BaseCollectionViewCell.swift in Sources */,
DE32D1D42C3BFB56006848DF /* UpdateProfileNameModel.swift in Sources */,
DDAF1C932C3D6E3D008A37D3 /* PromiseViewController.swift in Sources */,
DE9E18922C3BCC9D00DB76B4 /* SocialLoginRequestModel.swift in Sources */,
DE254AA82C3118EA00A4015E /* UIView+.swift in Sources */,
78AED12F2C3D8E56000AD80A /* MyPageAlarmSettingView.swift in Sources */,
DE254AAE2C31193600A4015E /* UIFont+.swift in Sources */,
DE9E189A2C3BCCBE00DB76B4 /* UtilsTemp.swift in Sources */,
782B407B2C3E395A008B0CA7 /* WelcomeView.swift in Sources */,
Expand All @@ -944,20 +980,20 @@
782B40722C3DBFA3008B0CA7 /* ProfileViewModel.swift in Sources */,
DDAF1C8F2C3D6E3D008A37D3 /* PromiseSegmentedControl.swift in Sources */,
DE32D1D22C3BF703006848DF /* LoginUserResponseModel.swift in Sources */,
780CC18F2C405B11008996D0 /* MyPageNavigationView.swift in Sources */,
DE9E18892C3BC91000DB76B4 /* ResponseBodyDTO.swift in Sources */,
DD931B6B2C3D9EBB00526452 /* ReadyStatusView.swift in Sources */,
DD3072202C3C0D4500416D9F /* MyReadyStatusResponseModel.swift in Sources */,
DD3072282C3C104D00416D9F /* ArrivalCompletionResponseModel.swift in Sources */,
DD931B6E2C3DA27F00526452 /* ParticipantCollectionViewCell.swift in Sources */,
DD931B762C3DC16100526452 /* PromiseInfoView.swift in Sources */,
DD3072242C3C0EB200416D9F /* MyPromiseReadyInfoRequestModel.swift in Sources */,
78AED12C2C3D8E56000AD80A /* MyPageContentView.swift in Sources */,
78AED1302C3D8E56000AD80A /* MyPageViewController.swift in Sources */,
789873332C3D1A7B00435E96 /* LoginViewModel.swift in Sources */,
782B40752C3DBFBA008B0CA7 /* ProfileView.swift in Sources */,
DED5DBEE2C34529A006ECE7E /* BaseView.swift in Sources */,
DE9E18802C3BA4AA00DB76B4 /* CustomButton.swift in Sources */,
DE254AB02C31195B00A4015E /* NSAttributedString+.swift in Sources */,
780CC1922C405B11008996D0 /* MyPageViewController.swift in Sources */,
DE8247FD2C36E7C7000601BC /* MoyaLoggingPlugin.swift in Sources */,
DDAF1C842C3D5D19008A37D3 /* ViewModelType.swift in Sources */,
DD3072262C3C0F0B00416D9F /* PromiseLateInfoResponseModel.swift in Sources */,
Expand Down

0 comments on commit 121f927

Please sign in to comment.