Fix merge conflicts PR #282 (#285)

* Fix merge conflicts * Fix lint
paypal · Jul 16, 2024 · 2cced79 · 2cced79
1 parent 91f572c
commit 2cced79
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/PayPal.xcodeproj/project.pbxproj b/PayPal.xcodeproj/project.pbxproj
@@ -570,7 +570,6 @@
 			path = Models;
 			sourceTree = "<group>";
 		};
-<<<<<<< HEAD
 		62D3FB122C3DB4B30046563B /* VenmoPaymentsTests */ = {
 			isa = PBXGroup;
 			children = (
@@ -586,7 +585,8 @@
 			);
 			name = VenmoPayments;
 			path = Sources/VenmoPayments;
-=======
+            sourceTree = "<group>";
+        };
 		45B063AD2C40346500E743F2 /* Eligibility */ = {
 			isa = PBXGroup;
 			children = (
@@ -606,7 +606,6 @@
 				45B063BC2C40545100E743F2 /* EligibilityClient_Tests.swift */,
 			);
 			path = Eligibility;
->>>>>>> venmo-feature
 			sourceTree = "<group>";
 		};
 		8036C1DE270F9BCF00C0F091 /* PaymentsCoreTests */ = {

diff --git a/Sources/VenmoPayments/VenmoClient.swift b/Sources/VenmoPayments/VenmoClient.swift
@@ -1,5 +1,6 @@
 import Foundation
 
 public class VenmoClient {
+
     // TODO: to be implemented in a future PR
 }
diff --git a/UnitTests/VenmoPaymentsTests/VenmoClient_Tests.swift b/UnitTests/VenmoPaymentsTests/VenmoClient_Tests.swift
@@ -1,5 +1,6 @@
 import XCTest
 
 public class VenmoClient_Tests: XCTestCase {
+
     // TODO: to be implemented in a future PR
 }