Skip to content

Commit

Permalink
✅ Chore: 머지 confilct 해결 (#542)
Browse files Browse the repository at this point in the history
  • Loading branch information
hwangJi-dev committed Oct 19, 2022
1 parent 74b6c8e commit 581a8a4
Show file tree
Hide file tree
Showing 3 changed files with 205 additions and 24 deletions.

This file was deleted.

23 changes: 11 additions & 12 deletions NadoSunbae-iOS/NadoSunbae.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@
335D91AF28D062FF000C05EF /* SeeMoreQuestionPersonCVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335D91AE28D062FF000C05EF /* SeeMoreQuestionPersonCVC.swift */; };
336216B128D1DBFD00FEA3E9 /* AvailableQuestionPersonCVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 336216B028D1DBFD00FEA3E9 /* AvailableQuestionPersonCVC.swift */; };
336216B528D2064900FEA3E9 /* RecentQuestionTVCReactor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 336216B428D2064900FEA3E9 /* RecentQuestionTVCReactor.swift */; };
3363431428FFF61F005D4230 /* RecentQuestionTVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3363431328FFF61F005D4230 /* RecentQuestionTVC.swift */; };
3363431628FFF62B005D4230 /* AvailableQuestionPersonTVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3363431528FFF62B005D4230 /* AvailableQuestionPersonTVC.swift */; };
3363431828FFFBC3005D4230 /* UnivType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3363431728FFFBC3005D4230 /* UnivType.swift */; };
3363431A28FFFC0D005D4230 /* SendCommunityInfoDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3363431928FFFC0D005D4230 /* SendCommunityInfoDelegate.swift */; };
336EEE3C27D93E9A0010A9E3 /* UserPermissionInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 336EEE3B27D93E9A0010A9E3 /* UserPermissionInfo.swift */; };
336EEE3E27D9A72C0010A9E3 /* PermissionType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 336EEE3D27D9A72C0010A9E3 /* PermissionType.swift */; };
336EEE4127DA77700010A9E3 /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 336EEE4027DA77700010A9E3 /* FirebaseAnalytics */; };
Expand Down Expand Up @@ -104,7 +104,6 @@
33A867BD288B0E9E009BA6DE /* RxRelay in Frameworks */ = {isa = PBXBuildFile; productRef = 33A867BC288B0E9E009BA6DE /* RxRelay */; };
33A867BF288B0E9E009BA6DE /* RxSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 33A867BE288B0E9E009BA6DE /* RxSwift */; };
33AE9BC928F4309D0081D069 /* NadoSwitch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33AE9BC828F4309D0081D069 /* NadoSwitch.swift */; };
33AFBE8A28FE976B002DF669 /* UnivType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33AFBE8928FE976B002DF669 /* UnivType.swift */; };
33B9B0D327B8EAC200066C1F /* CommunityPostDetailVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33B9B0D227B8EAC200066C1F /* CommunityPostDetailVC.swift */; };
33B9B0D727B8EB2A00066C1F /* InfoCommentTVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33B9B0D527B8EB2A00066C1F /* InfoCommentTVC.swift */; };
33B9B0D827B8EB2A00066C1F /* InfoCommentTVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33B9B0D627B8EB2A00066C1F /* InfoCommentTVC.xib */; };
Expand All @@ -129,7 +128,6 @@
33C79DCF2881B28900B6C32C /* CommunityTVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33C79DCE2881B28900B6C32C /* CommunityTVC.swift */; };
33C79DD22881B50D00B6C32C /* CommunityPostList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33C79DD12881B50D00B6C32C /* CommunityPostList.swift */; };
33CBEBFA28FB45B3002D0C84 /* MajorIDConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CBEBF928FB45B3002D0C84 /* MajorIDConstants.swift */; };
33CBEBFC28FB4FA9002D0C84 /* SendCommunityFilterInfoDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CBEBFB28FB4FA9002D0C84 /* SendCommunityFilterInfoDelegate.swift */; };
33CBEBFF28FC3FCE002D0C84 /* AvailableQuestionPersonTVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CBEBFD28FC3FCE002D0C84 /* AvailableQuestionPersonTVC.swift */; };
33CBEC0028FC3FCE002D0C84 /* RecentQuestionTVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CBEBFE28FC3FCE002D0C84 /* RecentQuestionTVC.swift */; };
33CF634F27945C0400E92C04 /* NadoSegmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CF634D27945C0300E92C04 /* NadoSegmentView.swift */; };
Expand Down Expand Up @@ -421,6 +419,8 @@
336216B428D2064900FEA3E9 /* RecentQuestionTVCReactor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecentQuestionTVCReactor.swift; sourceTree = "<group>"; };
3363431328FFF61F005D4230 /* RecentQuestionTVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecentQuestionTVC.swift; sourceTree = "<group>"; };
3363431528FFF62B005D4230 /* AvailableQuestionPersonTVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AvailableQuestionPersonTVC.swift; sourceTree = "<group>"; };
3363431728FFFBC3005D4230 /* UnivType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UnivType.swift; sourceTree = "<group>"; };
3363431928FFFC0D005D4230 /* SendCommunityInfoDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SendCommunityInfoDelegate.swift; sourceTree = "<group>"; };
336EEE3B27D93E9A0010A9E3 /* UserPermissionInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPermissionInfo.swift; sourceTree = "<group>"; };
336EEE3D27D9A72C0010A9E3 /* PermissionType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionType.swift; sourceTree = "<group>"; };
3381083427D53E18005AF1F9 /* MypageLikeListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MypageLikeListVC.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -471,7 +471,6 @@
33C79DCE2881B28900B6C32C /* CommunityTVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityTVC.swift; sourceTree = "<group>"; };
33C79DD12881B50D00B6C32C /* CommunityPostList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityPostList.swift; sourceTree = "<group>"; };
33CBEBF928FB45B3002D0C84 /* MajorIDConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MajorIDConstants.swift; sourceTree = "<group>"; };
33CBEBFB28FB4FA9002D0C84 /* SendCommunityFilterInfoDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendCommunityFilterInfoDelegate.swift; sourceTree = "<group>"; };
33CBEBFD28FC3FCE002D0C84 /* AvailableQuestionPersonTVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AvailableQuestionPersonTVC.swift; path = "NadoSunbae-iOS/Screen/Classroom/Cell/TVC/QuestionMain/AvailableQuestionPersonTVC.swift"; sourceTree = SOURCE_ROOT; };
33CBEBFE28FC3FCE002D0C84 /* RecentQuestionTVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = RecentQuestionTVC.swift; path = "NadoSunbae-iOS/Screen/Classroom/Cell/TVC/QuestionMain/RecentQuestionTVC.swift"; sourceTree = SOURCE_ROOT; };
33CF634D27945C0300E92C04 /* NadoSegmentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NadoSegmentView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -820,7 +819,7 @@
331364422785A4BA00E0C118 /* Struct */ = {
isa = PBXGroup;
children = (
33CBEC1A28FC72F2002D0C84 /* MajorIDConstants.swift */,
3363431728FFFBC3005D4230 /* UnivType.swift */,
331364932785D78F00E0C118 /* Identifiers.swift */,
33CF636B279567AF00E92C04 /* QuestionType.swift */,
5C32801E27973E1A00781EBE /* ListSortType.swift */,
Expand Down Expand Up @@ -1427,6 +1426,9 @@
children = (
5C3280132796E5A800781EBE /* MypageUserInfoModel.swift */,
775BAFD627D9353700DB37EB /* UserAuthInfo.swift */,
3363431328FFF61F005D4230 /* RecentQuestionTVC.swift */,
33AFBE8928FE976B002DF669 /* UnivType.swift */,
3363431528FFF62B005D4230 /* AvailableQuestionPersonTVC.swift */,
);
name = "Recovered References";
sourceTree = "<group>";
Expand Down Expand Up @@ -1850,7 +1852,7 @@
77AEEB1D2788B4670016880B /* Protocol */ = {
isa = PBXGroup;
children = (
33CBEC1C28FC7384002D0C84 /* SendCommunityInfoDelegate.swift */,
3363431928FFFC0D005D4230 /* SendCommunityInfoDelegate.swift */,
33CF635327945C1200E92C04 /* SendSegmentStateDelegate.swift */,
77ED045227AEBDAF00D077CA /* SendUpdateStatusDelegate.swift */,
77AEEB4C2789AF900016880B /* CVRegisterable.swift */,
Expand All @@ -1862,7 +1864,6 @@
C783BFA028A7D7E3000FE3D8 /* SendHomeRecentDataDelegate.swift */,
C7A81AC428ED681600642B70 /* SendRankerDataDelegate.swift */,
3332359C28EF482000F92793 /* SendContentSizeDelegate.swift */,
33CBEBFB28FB4FA9002D0C84 /* SendCommunityFilterInfoDelegate.swift */,
);
path = Protocol;
sourceTree = "<group>";
Expand Down Expand Up @@ -2229,18 +2230,15 @@
33834A1D27D67FAB001C4947 /* MypageLikeResponseData.swift in Sources */,
33CBEBFA28FB45B3002D0C84 /* MajorIDConstants.swift in Sources */,
331364642785ADFE00E0C118 /* BaseVC.swift in Sources */,
3363431428FFF61F005D4230 /* RecentQuestionTVC.swift in Sources */,
3332359B28EF37C200F92793 /* ClassroomReactor.swift in Sources */,
779DC5AD28EA942A009B9A43 /* ContentListData.swift in Sources */,
7754A32627954B770093C230 /* ReviewDetailPostTVC.swift in Sources */,
C790A26D289D551400A67135 /* HomeTitleHeaderCell.swift in Sources */,
5C485F242789661F00FCA5DF /* NadoTextField.swift in Sources */,
3313646C2785AEE000E0C118 /* String+.swift in Sources */,
331C5382279629620052B309 /* BaseQuestionTVC.swift in Sources */,
33AFBE8A28FE976B002DF669 /* UnivType.swift in Sources */,
77AA831A28A95B3D00985B80 /* ClassroomMainHeaderView.swift in Sources */,
33C1B8A327974A4F004BABEC /* ClassroomQuestionDetailData.swift in Sources */,
3363431628FFF62B005D4230 /* AvailableQuestionPersonTVC.swift in Sources */,
776B73DA28F4017E001216E7 /* EditProfileImgModalVC.swift in Sources */,
33D9EA8F27D75335000AF8DB /* NotificationInfo.swift in Sources */,
331364BF27861D0600E0C118 /* Adjusted+.swift in Sources */,
Expand Down Expand Up @@ -2333,6 +2331,7 @@
33C79DCB287F350100B6C32C /* NadoSegmentedControl.swift in Sources */,
77A049F627BD647900D09C69 /* ReviewDeleteResModel.swift in Sources */,
331364AE2785DC1900E0C118 /* ViewControllerFactory.swift in Sources */,
3363431A28FFFC0D005D4230 /* SendCommunityInfoDelegate.swift in Sources */,
33CF636827955D9500E92C04 /* ClassroomNC.swift in Sources */,
330ADB0828E353F80099E8D7 /* WritePostReqModel.swift in Sources */,
33F3ED8827C54E9F00731E24 /* EditPostQuestionModel.swift in Sources */,
Expand All @@ -2344,7 +2343,6 @@
5C32801F27973E1A00781EBE /* ListSortType.swift in Sources */,
331364A62785D90D00E0C118 /* NotificationMainVC.swift in Sources */,
5CC0BFD6279873B400B96905 /* ReadNotificationDataModel.swift in Sources */,
33CBEBFC28FB4FA9002D0C84 /* SendCommunityFilterInfoDelegate.swift in Sources */,
33856370278DC74D003C60A6 /* BaseTVC.swift in Sources */,
77AEEB452789AF380016880B /* MajorTVC.swift in Sources */,
5CC0BFDF2798A3B900B96905 /* SignAPI.swift in Sources */,
Expand Down Expand Up @@ -2372,6 +2370,7 @@
33A666A527BB958800779351 /* ReviewImgModel.swift in Sources */,
33834A1527D5F66E001C4947 /* MypageLikePostType.swift in Sources */,
779DC59828D84DA0009B9A43 /* RankingTVC.swift in Sources */,
3363431828FFFBC3005D4230 /* UnivType.swift in Sources */,
C7C4145027C93C4700296C30 /* EditProfileResponseModel.swift in Sources */,
33BAFD05278C061C00BFF6BE /* DefaultQuestionChatVC.swift in Sources */,
C790A276289D6D7D00A67135 /* HomeBannerCVC.swift in Sources */,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,194 @@
{
"pins" : [
{
"identity" : "abseil-cpp-swiftpm",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/abseil-cpp-SwiftPM.git",
"state" : {
"revision" : "583de9bd60f66b40e78d08599cc92036c2e7e4e1",
"version" : "0.20220203.2"
}
},
{
"identity" : "alamofire",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Alamofire/Alamofire.git",
"state" : {
"revision" : "8dd85aee02e39dd280c75eef88ffdb86eed4b07b",
"version" : "5.6.2"
}
},
{
"identity" : "boringssl-swiftpm",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/boringssl-SwiftPM.git",
"state" : {
"revision" : "dd3eda2b05a3f459fc3073695ad1b28659066eab",
"version" : "0.9.1"
}
},
{
"identity" : "firebase-ios-sdk",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/firebase-ios-sdk",
"state" : {
"branch" : "master",
"revision" : "26075af26e812c037a4bcd1be6c72ac5e2d6a8d4"
}
},
{
"identity" : "googleappmeasurement",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleAppMeasurement.git",
"state" : {
"revision" : "f54f60d0164d887e1174fa51ab2efe48a8e9d178",
"version" : "9.3.0"
}
},
{
"identity" : "googledatatransport",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleDataTransport.git",
"state" : {
"revision" : "5056b15c5acbb90cd214fe4d6138bdf5a740e5a8",
"version" : "9.2.0"
}
},
{
"identity" : "googleutilities",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleUtilities.git",
"state" : {
"revision" : "f4abe56ce62a779e64b525eb133c8fc2a84bbc1f",
"version" : "7.7.1"
}
},
{
"identity" : "grpc-ios",
"kind" : "remoteSourceControl",
"location" : "https://github.com/grpc/grpc-ios.git",
"state" : {
"revision" : "8440b914756e0d26d4f4d054a1c1581daedfc5b6",
"version" : "1.44.3-grpc"
}
},
{
"identity" : "gtm-session-fetcher",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/gtm-session-fetcher.git",
"state" : {
"revision" : "19605024d59eaefdb1f6a2cb11ebe75df4421126",
"version" : "2.0.0"
}
},
{
"identity" : "leveldb",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/leveldb.git",
"state" : {
"revision" : "0706abcc6b0bd9cedfbb015ba840e4a780b5159b",
"version" : "1.22.2"
}
},
{
"identity" : "moya",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Moya/Moya.git",
"state" : {
"branch" : "master",
"revision" : "42b4da6cf00ce35874f2aebebefb9564c2fdb799"
}
},
{
"identity" : "nanopb",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/nanopb.git",
"state" : {
"revision" : "819d0a2173aff699fb8c364b6fb906f7cdb1a692",
"version" : "2.30909.0"
}
},
{
"identity" : "promises",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/promises.git",
"state" : {
"revision" : "3e4e743631e86c8c70dbc6efdc7beaa6e90fd3bb",
"version" : "2.1.1"
}
},
{
"identity" : "reactiveswift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/ReactiveCocoa/ReactiveSwift.git",
"state" : {
"revision" : "c43bae3dac73fdd3cb906bd5a1914686ca71ed3c",
"version" : "6.7.0"
}
},
{
"identity" : "reactorkit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/ReactorKit/ReactorKit",
"state" : {
"revision" : "8fa33f09c6f6621a2aa536d739956d53b84dd139",
"version" : "3.2.0"
}
},
{
"identity" : "rxdatasources",
"kind" : "remoteSourceControl",
"location" : "https://github.com/RxSwiftCommunity/RxDataSources.git",
"state" : {
"revision" : "90c29b48b628479097fe775ed1966d75ac374518",
"version" : "5.0.2"
}
},
{
"identity" : "rxswift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/ReactiveX/RxSwift",
"state" : {
"branch" : "main",
"revision" : "e0ab8c4e18baf6679a65b325155923276b832687"
}
},
{
"identity" : "snapkit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/SnapKit/SnapKit.git",
"state" : {
"branch" : "develop",
"revision" : "07c5d1f6044701d97e94dc11157259e8811977be"
}
},
{
"identity" : "swift-protobuf",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-protobuf.git",
"state" : {
"revision" : "fa0fcd43f272a260e7f734f23e6dc55e16fcae0a",
"version" : "1.19.1"
}
},
{
"identity" : "then",
"kind" : "remoteSourceControl",
"location" : "https://github.com/devxoul/Then",
"state" : {
"branch" : "master",
"revision" : "d41ef523faef0f911369f79c0b96815d9dbb6d7a"
}
},
{
"identity" : "weakmaptable",
"kind" : "remoteSourceControl",
"location" : "https://github.com/ReactorKit/WeakMapTable.git",
"state" : {
"revision" : "cb05d64cef2bbf51e85c53adee937df46540a74e",
"version" : "1.2.1"
}
}
],
"version" : 2
}

0 comments on commit 581a8a4

Please sign in to comment.