Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix merge conflicts PR #282 #285

Merged
merged 2 commits into from
Jul 16, 2024
Merged

Fix merge conflicts PR #282 #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cd8c4b
Fix merge conflicts
richherrera Jul 15, 2024
2ede375
Fix lint
richherrera Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions PayPal.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,6 @@
path = Models;
sourceTree = "<group>";
};
<<<<<<< HEAD
62D3FB122C3DB4B30046563B /* VenmoPaymentsTests */ = {
isa = PBXGroup;
children = (
Expand All @@ -586,7 +585,8 @@
);
name = VenmoPayments;
path = Sources/VenmoPayments;
=======
sourceTree = "<group>";
};
45B063AD2C40346500E743F2 /* Eligibility */ = {
isa = PBXGroup;
children = (
Expand All @@ -606,7 +606,6 @@
45B063BC2C40545100E743F2 /* EligibilityClient_Tests.swift */,
);
path = Eligibility;
>>>>>>> venmo-feature
sourceTree = "<group>";
};
8036C1DE270F9BCF00C0F091 /* PaymentsCoreTests */ = {
Expand Down
1 change: 1 addition & 0 deletions Sources/VenmoPayments/VenmoClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Foundation

public class VenmoClient {

// TODO: to be implemented in a future PR
}
1 change: 1 addition & 0 deletions UnitTests/VenmoPaymentsTests/VenmoClient_Tests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import XCTest

public class VenmoClient_Tests: XCTestCase {

// TODO: to be implemented in a future PR
}
Loading