Closed adhiartaputra closed 4 months ago
Plan Error
running git merge -q --no-ff -m atlantis-merge FETCH_HEAD: Auto-merging README.md
Auto-merging Sources/Xendit/XDTCards.swift
Auto-merging Xendit.podspec
CONFLICT (content): Merge conflict in Xendit.podspec
Automatic merge failed; fix conflicts and then commit the result.
: exit status 1
Plan Error
running git merge -q --no-ff -m atlantis-merge FETCH_HEAD: Auto-merging README.md
Auto-merging Sources/Xendit/XDTCards.swift
Auto-merging Xendit.podspec
CONFLICT (content): Merge conflict in Xendit.podspec
Automatic merge failed; fix conflicts and then commit the result.
: exit status 1
Plan Error
running git merge -q --no-ff -m atlantis-merge FETCH_HEAD: Auto-merging README.md
Auto-merging Sources/Xendit/XDTCards.swift
Auto-merging Xendit.podspec
CONFLICT (content): Merge conflict in Xendit.podspec
Automatic merge failed; fix conflicts and then commit the result.
: exit status 1
Plan Error
running git merge -q --no-ff -m atlantis-merge FETCH_HEAD: Auto-merging README.md
Auto-merging Sources/Xendit/XDTCards.swift
Auto-merging Xendit.podspec
CONFLICT (content): Merge conflict in Xendit.podspec
Automatic merge failed; fix conflicts and then commit the result.
: exit status 1
Changes
Add card holder information inside card data object on create Token request
Add card_data object in the create authentication request
Update version to 3.9.0
Reference
https://xendit.atlassian.net/wiki/spaces/CA/pages/edit-v2/3369402517